COMP: How the f* did it ever work before...

[gdcm.git] / src / gdcmDocument.cxx

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 778e9a3854189ba48174d14f91e87e3f0432157b..cf01f037d4dcac996c871677ab89b3658da04b44 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/05/18 10:12:07 $
-  Version:   $Revision: 1.240 $
+  Date:      $Date: 2005/06/07 15:31:31 $
+  Version:   $Revision: 1.244 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -35,8 +35,6 @@
 namespace gdcm 
 {
 //-----------------------------------------------------------------------------
-// Refer to Document::CheckSwap()
-//const unsigned int Document::HEADER_LENGTH_TO_READ = 256;
 
 // Refer to Document::SetMaxSizeLoadEntry()
 const unsigned int Document::MAX_SIZE_LOAD_ELEMENT_VALUE = 0xfff; // 4096
@@ -67,7 +65,7 @@ Document::Document()
 
 /**
  * \brief   Constructor (not to break the API) 
- * @param   filename 'Document' (File or DicomDir) to be opened for parsing
+ * @param   fileName 'Document' (File or DicomDir) to be opened for parsing
  */
 Document::Document( std::string const &fileName )
          :ElementSet(-1) 
@@ -84,7 +82,12 @@ Document::Document( std::string const &fileName )
    // Load will set it to true if sucessfull
    IsDocumentAlreadyLoaded = false;
 
-   Load(fileName); 
+   Load(fileName);
+
+   // Normaly (?) Fp should be already deleted by CloseFile()
+   if ( Fp != 0 ) 
+      delete Fp;
+   Fp = 0;    
 }
 /**
  * \brief   Canonical destructor.
@@ -100,7 +103,7 @@ Document::~Document ()
 
 /**
  * \brief   Loader  
- * @param   filename 'Document' (File or DicomDir) to be opened for parsing
+ * @param   fileName 'Document' (File or DicomDir) to be opened for parsing
  * @return false if file cannot be open or no swap info was found,
  *         or no tag was found.
  */
@@ -111,9 +114,9 @@ bool Document::Load( std::string const &fileName )
    if( IsDocumentAlreadyLoaded )
    {
       gdcmWarningMacro( "A file was already parsed inside this "
-                     << "gdcm::Document (previous name was: "
-                    << Filename.c_str() << ". New name is :"
-                    << fileName );
+                        << "gdcm::Document (previous name was: "
+                        << Filename.c_str() << ". New name is :"
+                        << fileName );
      // todo : clean out the 'Document'
      // We should call ClearEntry() on the parent object ?!?
    }
@@ -802,9 +805,9 @@ int Document::ComputeGroup0002Length( FileType filetype )
  
             if( filetype == ExplicitVR )
             {
-               if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") ) 
+               if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UT") ) 
                {
-                  // explicit VR AND OB, OW, SQ : 4 more bytes
+                  // explicit VR AND OB, OW, SQ, UT : 4 more bytes
                   groupLength +=  4;
                }
             }
@@ -942,7 +945,7 @@ void Document::ParseDES(DocEntrySet *set, long offset,
                      if ( strLgrGroup != GDCM_UNFOUND)
                      {
                         lgrGroup = atoi(strLgrGroup.c_str());
-                        Fp->seekg(lgrGroup , std::ios::cur);
+                        Fp->seekg(lgrGroup, std::ios::cur);
                         used = false;
                         continue;
                      }
@@ -1153,7 +1156,6 @@ void Document::LoadDocEntry(DocEntry *entry)
    {
       if (BinEntry *binEntryPtr = dynamic_cast< BinEntry* >(entry) )
       {  
-         //s << "gdcm::NotLoaded (BinEntry)";
          s << GDCM_NOTLOADED;
          s << " Ad.:" << (long)entry->GetOffset();
          s << " x(" << std::hex << entry->GetOffset() << ")";
@@ -1162,10 +1164,8 @@ void Document::LoadDocEntry(DocEntry *entry)
          s << " x(" << std::hex << entry->GetLength() << ")";
          binEntryPtr->SetValue(s.str());
       }
-      // Be carefull : a BinEntry IS_A ValEntry ... 
       else if (ValEntry *valEntryPtr = dynamic_cast< ValEntry* >(entry) )
       {
-        // s << "gdcm::NotLoaded. (ValEntry)";
          s << GDCM_NOTLOADED;  
          s << " Address:" << (long)entry->GetOffset();
          s << " Length:"  << entry->GetLength();
@@ -1199,7 +1199,7 @@ void Document::LoadDocEntry(DocEntry *entry)
       uint32_t NewInt;
       int nbInt;
       // When short integer(s) are expected, read and convert the following 
-      // n *two characters properly i.e. consider them as short integers as
+      // (n * 2) characters properly i.e. consider them as short integers as
       // opposed to strings.
       // Elements with Value Multiplicity > 1
       // contain a set of integers (not a single one)       
@@ -1252,7 +1252,7 @@ void Document::LoadDocEntry(DocEntry *entry)
    {
       newValue = Util::DicomString(str, length+1);
       gdcmWarningMacro("Warning: bad length: " << length <<
-                       ",For string :" <<  newValue.c_str()); 
+                       " ,For string :" <<  newValue.c_str()); 
       // Since we change the length of string update it length
       //entry->SetReadLength(length+1);
    }
@@ -1299,7 +1299,7 @@ void Document::FindDocEntryLength( DocEntry *entry )
    
    if ( Filetype == ExplicitVR && !entry->IsImplicitVR() ) 
    {
-      if ( vr == "OB" || vr == "OW" || vr == "SQ" || vr == "UN" ) 
+      if ( vr == "OB" || vr == "OW" || vr == "SQ" || vr == "UT" || vr == "UN" ) 
       {
          // The following reserved two bytes (see PS 3.5-2003, section
          // "7.1.2 Data element structure with explicit vr", p 27) must be
@@ -1654,7 +1654,7 @@ void Document::FixDocEntryFoundLength(DocEntry *entry,
    // Allthough not recent many such GE corrupted images are still present
    // on Creatis hard disks. Hence this fix shall remain when such images
    // are no longer in use (we are talking a few years, here)...
-   // Note: XMedCom probably uses such a trick since it is able to read
+   // Note: XMedCon probably uses such a trick since it is able to read
    //       those pesky GE images ...
    if ( foundLength == 13)
    {