Solve (hope so!) the JPEG troubles when BitsStored == 8 && BitsAllocated==16

[gdcm.git] / src / gdcmDocument.cxx

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 77af0cc52660ac0d3414266a3b662ade6daafe28..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/06/18 11:10:17 $
-  Version:   $Revision: 1.361 $
+  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); // This one is recursive
+ // This one is recursive
+ // false : outside MetaElements
+ // false : outside Sequence
+   ElementSet::WriteContent(fp, filetype, false, false);
 }
 
 // -----------------------------------------
@@ -1349,7 +1351,6 @@ bool Document::ParseSQ( SeqEntry *seqEntry,
          gdcmWarningMacro("in ParseSQ : should never get here!");
          UnexpectedEOF = true;
          return false;
-         //break;
       }
       if ( delim_mode )
       {
@@ -1513,8 +1514,18 @@ void Document::FindDocEntryLength( DocEntry *entry )
    uint16_t length16;       
    if ( Filetype == ExplicitVR && !entry->IsImplicitVR() ) 
    {
+   
+   // WARNING :
+   //
+   // For some images, length of UN elements is coded on 2 bytes (instead of 4)
+   // There are *not* readable !
+   // You can make a quick and dirty patch, commenting out 
+   //| vr == "UN"
+   // in the following line.
+   // (the 'straight' images will no longer be readable ...)
+   
       if ( vr == "OB" || vr == "OW" || vr == "SQ" || vr == "UT" 
-                                                           || vr == "UN" || changeFromUN == true)
+                                                          || vr == "UN" || changeFromUN == true)
       {
          changeFromUN = false;
          // The following reserved two bytes (see PS 3.5-2003, section
@@ -2103,26 +2114,18 @@ bool Document::CheckSwap()
                    return false;
                s16 = *((uint16_t *)(deb+2));
 
-               //s32 = *((uint32_t *)(deb));
                Fp->seekg ( 0L, std::ios::beg); // Once per Document
                CurrentOffsetPosition = 0;
                switch(s16)  // try an other trick!
                             // -> to be able to decode 0029|1010 DataElement
                             // -> and be not less cleaver than dcmdump ;-)
                {
-                  case 0x00040000 :
-                     SwapCode = 4321;
+                  case 0x0004 :
+                     SwapCode = 1234; 
                      break;
-                  case 0x04000000 :
+                  case 0x0400 :
                      SwapCode = 3412;
-                     break;
-                  case 0x00000400 :
-                     SwapCode = 2143;
-                     break;
-                  case 0x00000004 :
-                     SwapCode = 1234;
-                      break;
-     
+                     break;      
                   default:
                      gdcmWarningMacro("ACR/NEMA unfound swap info (Hopeless !)");
                      Filetype = Unknown;
@@ -2217,7 +2220,7 @@ DocEntry *Document::ReadNextDocEntry()
    changeFromUN = false;
    CurrentGroup = GetInt16();
    CurrentElem  = GetInt16();
-   
+      
    // In 'true DICOM' files Group 0002 is always little endian
    if ( HasDCMPreamble )
    {
@@ -2242,18 +2245,26 @@ DocEntry *Document::ReadNextDocEntry()
          realVR = "UL";
       }
 
-      // Commented out in order not to generate 'Shadow Groups' where some 
+      // Was commented out in order not to generate 'Shadow Groups' where some 
       // Data Elements are Explicit VR and some other ones Implicit VR
-      // (Stupid MatLab DICOM Reader couldn't read gdcm-written images)
-      /*
-      else if (CurrentGroup%2 == 1 &&  
-                               (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
-         realVR = "LO";
+      // -> Better we fix the problem at Write time
+     
+      else if (CurrentGroup%2 == 1 )
+      { 
+         if (CurrentElem >= 0x0010 && CurrentElem <=0x00ff )
+            // 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      
       }
-      */
+      
       else
       {
          DictEntry *dictEntry = GetDictEntry(CurrentGroup,CurrentElem);//only when ImplicitVR
@@ -2278,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.
       }