* src/gdcmFile.cxx : bug fix under Window after JPR commit

        RQ : the JPR doesn't appear in the ChangeLog... normal for him
      -- BeNours

diff --git a/ChangeLog b/ChangeLog
index a806cbb1fbb4f3a54efdbbf721867b155b14b9e6..ba66981b25327b2f20278ce27ad1a41884ac6c08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2003-07-03  Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
       * vtk/Makefile.am: vtkGdcmReader.h should now be cleany installed
         when using make instal.
+      * src/gdcmFile.cxx : bug fix under Window after JPR commit
+        RQ : the JPR doesn't appear in the ChangeLog... normal for him
 
 2003-07-03  Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
       * setup.py : adding include dir of jpeg lib to compile all sources

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index f72941973374dbb427afe0a31c817fa16c12c203..94f86cb7e88c62d58d9f0eff77e2c7e45b7014b9 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -196,9 +196,7 @@ bool gdcmFile::ReadPixelData(void* destination) {
          return false;
       }
       
-      int res = gdcm_read_JPEG_file (destination);
-         if (DEBUG) 
-            printf ("res : %d\n",res);
+      bool res = (bool)gdcm_read_JPEG_file (destination);
       return res;
 }   
 
@@ -325,7 +323,7 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
       // TODO :
       // any trick not to have to allocate temporary buffer is welcome ...
       char *x = newDest;
-      for (int i=0;i<l; i++) {
+      for (int j=0;j<l; j++) {
          *(x++) = *(a++);
          *(x++) = *(b++);
          *(x++) = *(c++);