X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=671e6bd381f4d198301f51dfb4aae666beb25add;hb=d9145e01b1e8f7f5378def524f6ffd5f9491abaf;hp=b310e37e5386ba53d3ecae0cf8ed52d347f013f5;hpb=09eb38b5b2fe392e64390b7c2eadf822541f92ba;p=gdcm.git

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index b310e37e..671e6bd3 100644
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/03/22 11:39:04 $
-  Version:   $Revision: 1.59 $
+  Date:      $Date: 2005/07/05 14:55:24 $
+  Version:   $Revision: 1.63 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -25,11 +25,13 @@
 #include "gdcmDocument.h"
 
 #include <fstream>
+#include <ctype.h>  // for isdigit
+#include <stdlib.h> // for atoi
 
 namespace gdcm 
 {
 //-----------------------------------------------------------------------------
-#define MAX_SIZE_PRINT_ELEMENT_VALUE 0x7fffffff;
+#define MAX_SIZE_PRINT_ELEMENT_VALUE 0x7fffffff
 uint32_t ValEntry::MaxSizePrintEntry = MAX_SIZE_PRINT_ELEMENT_VALUE;
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -146,13 +148,13 @@ void ValEntry::SetValue(std::string const &val)
    if ( l != 0) // To avoid to be cheated by 'zero length' integers
    {   
       const VRKey &vr = GetVR();
-      if( vr == "US" || vr == "SS" )
+      if ( vr == "US" || vr == "SS" )
       {
          // for multivaluated items
          l = (Util::CountSubstring(val, "\\") + 1) * 2;
          ContentEntry::SetValue(val);
       }
-      else if( vr == "UL" || vr == "SL" )
+      else if ( vr == "UL" || vr == "SL" )
       {
          // for multivaluated items
          l = (Util::CountSubstring(val, "\\") + 1) * 4;;
@@ -214,7 +216,7 @@ void ValEntry::Print(std::ostream &os, std::string const &)
     
    TSAtr v  = GetValue();     
    d2 = Util::CreateCleanString(v);  // replace non printable characters by '.'            
-   if( (long)GetLength() <= ValEntry::GetMaxSizePrintEntry()
+   if ( (long)GetLength() <= ValEntry::GetMaxSizePrintEntry()
     || PrintLevel >= 3
     || d2.find(GDCM_NOTLOADED) < d2.length() )
    {
@@ -281,7 +283,7 @@ void ValEntry::Print(std::ostream &os, std::string const &)
    {
       if (v == "4294967295") // to avoid troubles in convertion 
       {
-         st = Util::Format(" x(ffffffff)");
+         st = "ffffffff";
       }
       else
       {
@@ -291,7 +293,7 @@ void ValEntry::Print(std::ostream &os, std::string const &)
          }
          else
          {
-            st = Util::Format(" ");
+            st = " ";
          }
       }
       s << st;