BUG: There was two bombs at the same time. Guess what what I found them all

[gdcm.git] / src / gdcmValEntry.cxx

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index c0082d832bb279989dfb8cdf9822fb1630f99fad..d10cacae8823af65fa20e75d8c294877b9a07e61 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/06/23 13:02:36 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2004/07/02 13:55:28 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -69,8 +69,8 @@ gdcmValEntry::~gdcmValEntry (void)
  */
 void gdcmValEntry::Print(std::ostream & os)
 {
-   guint16 g = GetGroup();
-   guint16 e = GetElement();
+   uint16_t g = GetGroup();
+   uint16_t e = GetElement();
    std::string vr = GetVR();
    std::ostringstream s; 
    char st[20];
@@ -137,7 +137,7 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype)
 {
    gdcmDocEntry::Write(fp, filetype);
    std::string vr=GetVR();
-   int lgr=GetLength();
+   int lgr=GetReadLength();
    if (vr == "US" || vr == "SS")
    {
       // some 'Short integer' fields may be mulivaluated
@@ -147,7 +147,7 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype)
       tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
       Tokenize (GetValue(), tokens, "\\");
       for (unsigned int i=0; i<tokens.size();i++) {
-         guint16 val_uint16 = atoi(tokens[i].c_str());
+         uint16_t val_uint16 = atoi(tokens[i].c_str());
          void *ptr = &val_uint16;
          fwrite ( ptr,(size_t)2 ,(size_t)1 ,fp);
       }
@@ -164,13 +164,14 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype)
       tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
       Tokenize (GetValue(), tokens, "\\");
       for (unsigned int i=0; i<tokens.size();i++){
-         guint32 val_uint32 = atoi(tokens[i].c_str());
+         uint32_t val_uint32 = atoi(tokens[i].c_str());
          void *ptr = &val_uint32;
          fwrite ( ptr,(size_t)4 ,(size_t)1 ,fp);
       }
       tokens.clear();
       return;
-   }           
+   } 
+          
    fwrite (GetValue().c_str(), (size_t)lgr ,(size_t)1, fp); // Elem value
 }