X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.cxx;h=a704502332df4a54f91b6cb52f02bdf635969a10;hb=2b3445eb897dead75de24df82eaea22364fa4c6c;hp=4922c856c0b799c2cd7aa99945479ed0690c0c46;hpb=b083a867887309f4cefa627a0e7dd960bd26be36;p=gdcm.git

diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx
index 4922c856..a7045023 100644
--- a/vtk/vtkGdcmReader.cxx
+++ b/vtk/vtkGdcmReader.cxx
@@ -58,7 +58,7 @@
 #include <vtkPointData.h>
 #include <vtkLookupTable.h>
 
-vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.56 $");
+vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.57 $");
 vtkStandardNewMacro(vtkGdcmReader);
 
 //-----------------------------------------------------------------------------
@@ -278,7 +278,7 @@ void vtkGdcmReader::ExecuteData(vtkDataObject *output)
       unsigned long UpdateProgressCount = 0;
 
       // Feeling the allocated memory space with each image/volume:
-      unsigned char *Dest = (unsigned char *)data->GetPointData()->GetScalars()->GetVoidPointer(0);
+      unsigned char *Dest = (unsigned char *)data->GetScalarPointer();
       for (std::list<std::string>::iterator filename  = InternalFileNameList.begin();
            filename != InternalFileNameList.end();
            ++filename)
@@ -688,14 +688,6 @@ size_t vtkGdcmReader::LoadImageInMemory(
 //   fwrite(Dest,size,1,f2);
 //   fclose(f2); 
    
-   //GetImageData allocate a (void*)malloc, remove it:
-
-   // CLEANME
-   // Now, the delete on values keep from GetImageData is useless (made in
-   // the PixelConvert class)
-
-//   unsigned char * pSource     = source; //pointer for later deletion
-//   delete[] pSource;
    return size;
 }