Comment out strangr code nad replace by simpler one.

[gdcm.git] / src / gdcmDocEntry.cxx

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index d2f9a0c6aa768ef068ba71b690bf3087ade1545b..2da966c81b10ac832565766456be6e02adfd72b3 100644 (file)
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/25 13:12:43 $
-  Version:   $Revision: 1.64 $
+  Date:      $Date: 2005/09/21 09:44:59 $
+  Version:   $Revision: 1.69 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -75,16 +75,18 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
    binary_write( *fp, group); //group number
    binary_write( *fp, el);    //element number
 
-   if ( filetype == ExplicitVR )
+   // Dicom V3 group 0x0002 is *always* Explicit VR !
+   if ( filetype == ExplicitVR || group == 0x0002 )
    {
       // Special case of delimiters:
       if (group == 0xfffe)
       {
          // Delimiters have NO Value Representation
          // Hence we skip writing the VR.
+         //
          // In order to avoid further troubles, we choose to write them
          // as 'no-length' Item Delimitors (we pad by writing 0xffffffff)
-         // We shall force the end of a given Item by writting 
+         // We shall force the end of a given SeqItem by writting 
          //  a Item Delimitation Item (fffe, e00d)
 
          uint32_t ff = 0xffffffff;
@@ -92,24 +94,31 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
          return;
       }
 
-      uint16_t z = 0;
+      uint16_t zero = 0;
       uint16_t shortLgr = (uint16_t)lgth;
 
       if (vr == GDCM_UNKNOWN)
       {
-         // Unknown was 'written'
-         // deal with Little Endian            
-         binary_write(*fp, shortLgr);
-         binary_write(*fp, z);
+         // GDCM_UNKNOWN was stored in the Entry VR;
+         // deal with Entry as if TS were Implicit VR
+ 
+         // FIXME : troubles expected on big endian processors :
+         // let lgth = 0x00001234
+         // we write 34 12 00 00 on little endian proc (OK)
+         // we write 12 34 00 00 on big endian proc (KO)          
+         //binary_write(*fp, shortLgr);
+         //binary_write(*fp, zero);
+
+         binary_write(*fp, lgth);
       }
       else
       {
          binary_write(*fp, vr);
          gdcmAssertMacro( vr.size() == 2 );
                   
-         if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || (vr == "UN") )
+         if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") /*|| (vr == "UN")*/ )
          {
-            binary_write(*fp, z);
+            binary_write(*fp, zero);
             if (vr == "SQ")
             {
                // we set SQ length to ffffffff
@@ -237,13 +246,13 @@ void DocEntry::Print(std::ostream &os, std::string const & )
    if (PrintLevel >= 2)
    {
       s << " lg : ";
-      lgth = GetReadLength(); // ReadLength, as opposed to Length
+      lgth = GetReadLength(); // ReadLength, as opposed to (usable) Length
       if (lgth == 0xffffffff)
       {
          st = " ffff ";
          s.setf(std::ios::left);
          s << std::setw(4);  
-         s << "   x(ffff) ";
+         s << "    x(ffff) ";
          s.setf(std::ios::left);
          s << std::setw(8) << "-1"; 
       }
@@ -251,17 +260,19 @@ void DocEntry::Print(std::ostream &os, std::string const & )
       {
          st = Util::Format("x(%x)",lgth); // we may keep it
          s.setf(std::ios::left);
-         s << std::setw(10-st.size()) << " ";
+         s << std::setw(11-st.size()) << " ";
          s << st << " ";
          s.setf(std::ios::left);
          s << std::setw(8) << lgth; 
       }
       s << " Off.: ";
       st = Util::Format("x(%x)",o);  // we may keep it
-      s << std::setw(10-st.size()) << " ";
+      s << std::setw(11-st.size()) << " ";
       s << st << " ";
       s << std::setw(8) << o; 
    }
+   if (PrintLevel >= 1)
+      s << " ";
 
    s << "[" << vr  << "] ";