* src/gdcmFile.h : bug fix. Variable type and variable name had same name

[gdcm.git] / src / gdcmValEntry.cxx

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 052444766083ff178c23f99b34f5c238dce03fb1..d6d7b89dfa23f7a20debac870ddd46f93eecc639 100644 (file)
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/05 20:23:14 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2004/11/25 15:46:12 $
+  Version:   $Revision: 1.38 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -76,6 +76,7 @@ void ValEntry::Print(std::ostream & os)
    TSKey v;
    std::string d2;
      
+   os << "V ";
    DocEntry::Print(os); 
 
    if (g == 0xfffe)
@@ -108,7 +109,7 @@ void ValEntry::Print(std::ostream & os)
       {
          if ( v.length() != 0 )  // for brain damaged headers
          {
-            if ( ! isdigit(v[v.length()-1]) )
+            if ( ! isdigit((unsigned char)v[v.length()-1]) )
             {
                v.erase(v.length()-1, 1);
             }
@@ -124,7 +125,7 @@ void ValEntry::Print(std::ostream & os)
          {
             if ( v.length() != 0 )  // for brain damaged headers
             {
-               if ( ! isdigit(v[v.length()-1]) )
+               if ( ! isdigit((unsigned char)v[v.length()-1]) )
                {
                   v.erase(v.length()-1, 1);
                }
@@ -140,7 +141,7 @@ void ValEntry::Print(std::ostream & os)
             {
                if ( v.length() != 0 )  // for brain damaged headers  
                {
-                  if ( ! isdigit(v[v.length()-1]) )
+                  if ( ! isdigit((unsigned char)v[v.length()-1]) )
                   {
                      v.erase(v.length()-1, 1);  
                   }
@@ -176,9 +177,9 @@ void ValEntry::Print(std::ostream & os)
 /*
  * \brief   canonical Writer
  */
-void ValEntry::Write(std::ofstream* fp, FileType filetype)
+void ValEntry::WriteContent(std::ofstream* fp, FileType filetype)
 {
-   DocEntry::Write(fp, filetype);
+   DocEntry::WriteContent(fp, filetype);
 
    //std::cout << "=====================================" << GetVR() << std::endl;
       
@@ -188,7 +189,7 @@ void ValEntry::Write(std::ofstream* fp, FileType filetype)
    }
       
    std::string vr = GetVR();
-   int lgr = GetReadLength();
+   unsigned int lgr = GetReadLength();
    if (vr == "US" || vr == "SS")
    {
       // some 'Short integer' fields may be mulivaluated
@@ -223,8 +224,7 @@ void ValEntry::Write(std::ofstream* fp, FileType filetype)
       return;
    } 
 
-   //Due to seriously broken Theralys images I cannot put that here.
-   //assert( lgr == GetValue().size() ); 
+   assert( lgr == GetValue().size() ); 
    binary_write(*fp, GetValue());
 }