Jpeg writter is no longer confused by DataElements 7fe0|0010 inside a Sequence

[gdcm.git] / src / gdcmDocument.cxx

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 115f3054c4c75eb777f0bfa71dbbe045cef8c534..72713e4483292140701d7dbc21ec792ba5346fe9 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: 2007/07/27 09:49:31 $
-  Version:   $Revision: 1.365 $
+  Date:      $Date: 2007/08/29 15:30:49 $
+  Version:   $Revision: 1.368 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -721,8 +721,10 @@ void Document::WriteContent(std::ofstream *fp, FileType filetype)
     * --> was too much tricky / we were [in a hurry / too lazy]
     * --> We don't write the element 0x0000 (group length)
     */
-
-   ElementSet::WriteContent(fp, filetype, false); // This one is recursive
+ // This one is recursive
+ // false : outside MetaElements
+ // false : outside Sequence
+   ElementSet::WriteContent(fp, filetype, false, false);
 }
 
 // -----------------------------------------
@@ -2250,9 +2252,15 @@ DocEntry *Document::ReadNextDocEntry()
       else if (CurrentGroup%2 == 1 )
       { 
          if (CurrentElem >= 0x0010 && CurrentElem <=0x00ff )
-            // DICOM PS 3-5 7.8.1 a) states that those 
-            // (gggg-0010->00FF where gggg is odd) attributes have to be LO
+            // DICOM PS 3-5 7.8.1 a) states that :
+            // Private Creator Data Elements numbered (gggg,0010-00FF) (gggg is odd)
+            // attributes have to be LO (Long String) and the VM shall be equal to 1
             realVR = "LO";
+    
+            // Seems not to be true
+            // Still in gdcmtk, David Clunnie disagrees, Marco Eichelberg says it's OK ...
+            // We let it for a while? 
+            //(We should check length==4, for more security, but we don't have it yet !)
          else if ( CurrentElem == 0x0001)
             realVR = "UL"; // Private Group Length To End      
       }
@@ -2281,7 +2289,7 @@ DocEntry *Document::ReadNextDocEntry()
          // for VR = "UN", length is always stored on 4 bytes.
          changeFromUN=true;
          /// \todo : fixme If inside a supposed to be UN DataElement (but SQ according to a private dictionnary)
-         ///         there is some more supposed to UN DataElements, it will probabely fail.
+         ///         there is some more supposed to be UN DataElements, it will probabely fail.
          ///         --> find a -non time consuming- trick to store changeFromUN info at DataElement level,
          ///         not at the Document level.
       }