Add the VISIT object within DicomDir

[gdcm.git] / src / gdcmDocEntry.cxx

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index 474d5681305e2ad956335c115cab6ca3f6da9c45..488b062ab22865930c8f17cb402e159271a89903 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/02/02 16:18:48 $
-  Version:   $Revision: 1.52 $
+  Date:      $Date: 2005/06/24 10:55:59 $
+  Version:   $Revision: 1.59 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -29,9 +29,7 @@
 namespace gdcm 
 {
 //-----------------------------------------------------------------------------
-#define MAX_SIZE_PRINT_ELEMENT_VALUE 64
 
-//-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
  * \brief   Constructor from a given DictEntry
@@ -62,7 +60,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
    uint16_t group = GetGroup();
    VRKey vr       = GetVR();
    uint16_t el    = GetElement();
-   uint32_t lgr   = GetLength();
+   uint32_t lgth  = GetLength();
 
    if ( group == 0xfffe && el == 0x0000 )
    {
@@ -95,7 +93,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
       }
 
       uint16_t z = 0;
-      uint16_t shortLgr = lgr;
+      uint16_t shortLgr = (uint16_t)lgth;
 
       if (vr == GDCM_UNKNOWN)
       {
@@ -121,7 +119,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
             }
             else
             {
-               binary_write(*fp, lgr);
+               binary_write(*fp, lgth);
             }
          }
          else
@@ -138,7 +136,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
       }
       else
       {
-         binary_write(*fp, lgr);
+         binary_write(*fp, lgth);
       }
    }
 }
@@ -222,7 +220,7 @@ void DocEntry::Print(std::ostream &os, std::string const & )
 
    o  = GetOffset();
    vr = GetVR();
-   if(vr==GDCM_UNKNOWN)
+   if ( vr==GDCM_UNKNOWN )
       vr="  ";
 
    s << DictEntry::TranslateToKey(GetGroup(),GetElement()); 
@@ -233,16 +231,15 @@ void DocEntry::Print(std::ostream &os, std::string const & )
       lgth = GetReadLength(); // ReadLength, as opposed to Length
       if (lgth == 0xffffffff)
       {
-         st = Util::Format("x(ffff)");  // I said : "x(ffff)" !
          s.setf(std::ios::left);
-         s << std::setw(10-st.size()) << " ";  
-         s << st << " ";
+         s << std::setw(10-st.size());  
+         s << " ffff ";
          s.setf(std::ios::left);
          s << std::setw(8) << "-1"; 
       }
       else
       {
-         st = Util::Format("x(%x)",lgth);
+         st = Util::Format("x(%x)",lgth); // we may keep it
          s.setf(std::ios::left);
          s << std::setw(10-st.size()) << " ";
          s << st << " ";
@@ -250,7 +247,7 @@ void DocEntry::Print(std::ostream &os, std::string const & )
          s << std::setw(8) << lgth; 
       }
       s << " Off.: ";
-      st = Util::Format("x(%x)",o); 
+      st = Util::Format("x(%x)",o);  // we may keep it
       s << std::setw(10-st.size()) << " ";
       s << st << " ";
       s << std::setw(8) << o;