* Bug fix on field having a VR = 'UI'. Assume that is a string field

[gdcm.git] / src / gdcmHeaderEntry.cxx

diff --git a/src/gdcmHeaderEntry.cxx b/src/gdcmHeaderEntry.cxx
index 6ce3a9f8f1d6a7f18339923378db82fadb8bc6fd..c74b8afb8415d246645e534f72dc4806af4d4a9d 100644 (file)
--- a/src/gdcmHeaderEntry.cxx
+++ b/src/gdcmHeaderEntry.cxx
@@ -27,7 +27,6 @@ gdcmHeaderEntry::gdcmHeaderEntry(gdcmDictEntry* in) {
 
 //-----------------------------------------------------------------------------
 // Print
-
 void gdcmHeaderEntry::Print(std::ostream & os) {
    size_t o;
    unsigned short int g, e;
@@ -44,14 +43,14 @@ void gdcmHeaderEntry::Print(std::ostream & os) {
    v = GetValue();
    o = GetOffset();
    sprintf(greltag,"%04x|%04x ",g,e);           
-   d2 = _CreateCleanString(v);  // replace non printable characters by '.'
    s << greltag ;
        
+   d2 = _CreateCleanString(v);  // replace non printable characters by '.'
    if (printLevel>=2) { 
       s << "lg : ";
       lgth = GetReadLength();
       if (lgth == 0xffffffff) {
-         sprintf(st,"x(%ff)");
+         sprintf(st,"x(ffff)");  // I said : "x(ffff)" !
          s.setf(std::ios::left);
          s << std::setw(10-strlen(st)) << " ";  
          s << st << " ";
@@ -67,7 +66,7 @@ void gdcmHeaderEntry::Print(std::ostream & os) {
       }
       s << " Off.: ";
       sprintf(st,"x(%x)",o); 
-      s << std::setw(10-strlen(st)) << " ";       
+      s << std::setw(10-strlen(st)) << " ";
       s << st << " ";
       s << std::setw(8) << o; 
    }
@@ -81,23 +80,24 @@ void gdcmHeaderEntry::Print(std::ostream & os) {
      
    s << "[" << GetName()<< "]";       
    s << " [" << d2 << "]";
-    // Display the UID value (instead of displaying the rough code)  
+
+   // Display the UID value (instead of displaying the rough code)  
    if (g == 0x0002) {  // Any more to be displayed ?
-      if ( (e == 0x0010) || (e == 0x0002) )       
-         s << "  ==>\t[" << ts->GetValue(v) << "]";   
+      if ( (e == 0x0010) || (e == 0x0002) )
+         s << "  ==>\t[" << ts->GetValue(v) << "]";
    } else {
       if (g == 0x0008) {
-         if ( (e == 0x0016) || (e == 0x1150)  )           
-            s << "  ==>\t[" << ts->GetValue(v) << "]"; 
+         if ( (e == 0x0016) || (e == 0x1150)  )
+            s << "  ==>\t[" << ts->GetValue(v) << "]";
       }
-   } 
+   }
    if (e == 0x0000) {        // elem 0x0000 --> group length 
       if (v == "4294967295") // to avoid troubles in convertion 
          sprintf (st," x(ffffffff)");
       else     
          sprintf(st," x(%08x)",atoi(v.c_str()));
       s << st;
-   }                     
+   }
    s << std::endl;
    os << s.str();
 }