X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=8896d14d0fe73c9b7cb730984dfedc78f6b85c85;hb=21d241b3fdcf675d8d91a6daf6dfd6f448b68195;hp=5ebc0cb127b4806418b0090e40274eda6d11d6f0;hpb=01940747ce53f8c87bc883c47fd152e787e73b07;p=gdcm.git

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 5ebc0cb1..8896d14d 100644
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/09/21 09:42:19 $
-  Version:   $Revision: 1.282 $
+  Date:      $Date: 2005/10/10 10:49:24 $
+  Version:   $Revision: 1.286 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -966,7 +966,9 @@ void Document::ParseDES(DocEntrySet *set, long offset,
    bool used; // will be set to false when something wrong happens to an Entry.
               // (Entry will then be deleted)
    bool delim_mode_intern = delim_mode;
-   bool first = true;  
+   bool first = true;
+   gdcmWarningMacro( "Enter in ParseDES, delim-mode " <<  delim_mode
+                     << " at offset " << std::hex << offset ); 
    while (true)
    {
       if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
@@ -1109,8 +1111,8 @@ void Document::ParseDES(DocEntrySet *set, long offset,
                      {
                         lgrGroup = atoi(strLgrGroup.c_str());
                         Fp->seekg(lgrGroup, std::ios::cur);
-                        used = false;
-                        RemoveEntry( newDocEntry );
+                        //used = false;  // never used
+                        RemoveEntry( newDocEntry );  // Remove and delete
                         // bcc 5.5 is right "assigned a value that's never used"
                         // newDocEntry = 0;
                         continue;
@@ -1156,7 +1158,8 @@ void Document::ParseDES(DocEntrySet *set, long offset,
             if ( newDocEntry->GetGroup()%2 != 0 )
             {
                 Fp->seekg( l, std::ios::cur);
-                used = false;
+                RemoveEntry( newDocEntry );  // Remove and delete
+                //used = false; // never used
                 continue;  
             } 
          } 
@@ -1164,7 +1167,8 @@ void Document::ParseDES(DocEntrySet *set, long offset,
          {
            // User asked to skip *any* SeQuence
             Fp->seekg( l, std::ios::cur);
-            used = false;
+            //used = false; // never used
+            RemoveEntry( newDocEntry );  // Remove and delete
             continue;
          }
          // delay the dynamic cast as late as possible
@@ -1198,9 +1202,17 @@ void Document::ParseDES(DocEntrySet *set, long offset,
 
          if ( l != 0 )
          {  // Don't try to parse zero-length sequences
+
+            gdcmWarningMacro( "Entry in ParseSQ, delim " << delim_mode_intern
+                               << " at offset " << std::hex
+                               << newDocEntry->GetOffset() );
+
             ParseSQ( newSeqEntry, 
                      newDocEntry->GetOffset(),
                      l, delim_mode_intern);
+
+            gdcmWarningMacro( "Exit from ParseSQ, delim " << delim_mode_intern);
+ 
          }
          if ( !set->AddEntry( newSeqEntry ) )
          {
@@ -1211,7 +1223,7 @@ void Document::ParseDES(DocEntrySet *set, long offset,
             used = false;
          }
  
-        if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
+         if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
          {
             if ( !used )
                delete newDocEntry;  
@@ -1225,6 +1237,7 @@ void Document::ParseDES(DocEntrySet *set, long offset,
       }
       first = false;
    }                               // end While
+   gdcmWarningMacro( "Exit from ParseDES, delim-mode " << delim_mode );
 }
 
 /**
@@ -1342,6 +1355,7 @@ return newEntry;
  * \brief   Loads (or not) the element content depending if its length exceeds
  *          or not the value specified with Document::SetMaxSizeLoadEntry()
  * @param   entry Header Entry (Dicom Element) to be dealt with
+ * @param forceLoad whether you want to force loading of 'long' elements
  */
 void Document::LoadDocEntry(DocEntry *entry, bool forceLoad)
 {
@@ -2358,6 +2372,22 @@ void Document::HandleBrokenEndian(uint16_t &group, uint16_t &elem)
      reversedEndian--;
      SwitchByteSwapCode();
    }
+   else if (group == 0xfeff && elem == 0xdde0) 
+   {
+     // reversed Sequence Terminator found
+     // probabely a bug in the header !
+     // Do what you want, it breaks !
+     //reversedEndian--;
+     //SwitchByteSwapCode();
+     gdcmWarningMacro( "Should never get here! reversed Sequence Terminator!" ); 
+     // fix the tag
+      group = 0xfffe;
+      elem  = 0xe0dd;  
+   }
+   else if (group == 0xfffe && elem == 0xe0dd) 
+   {
+      gdcmWarningMacro( "Straight Sequence Terminator." );  
+   }
 }
 
 /**