X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.cxx;h=64a369f1d83b7e96f0ca16f900c5852e034d80b1;hb=dc2846f4750cf09f08d5f356792b8a12f2a97a2f;hp=97d0115c83fc4db6327a175eee7803ba52f3e08c;hpb=b6969c4d25a055bedc387044058beb1e4c36ee80;p=gdcm.git

diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx
index 97d0115c..64a369f1 100644
--- a/vtk/vtkGdcmReader.cxx
+++ b/vtk/vtkGdcmReader.cxx
@@ -1,7 +1,7 @@
 // vtkGdcmReader.cxx
 //-----------------------------------------------------------------------------
 // //////////////////////////////////////////////////////////////
-// WARNING TODO CLENAME 
+// WARNING TODO CLEANME 
 // Actual limitations of this code:
 //
 // /////// Redundant and unnecessary header parsing
@@ -58,7 +58,7 @@
 #include <vtkPointData.h>
 #include <vtkLookupTable.h>
 
-vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.49 $");
+vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.53 $");
 vtkStandardNewMacro(vtkGdcmReader);
 
 //-----------------------------------------------------------------------------
@@ -444,7 +444,7 @@ int vtkGdcmReader::CheckFileCoherence()
       fclose(fp);
 
       // Stage 1.2: check for Gdcm parsability
-      gdcmHeader GdcmHeader(filename->c_str() );
+      gdcm::Header GdcmHeader(filename->c_str() );
       if (!GdcmHeader.IsReadable())
       {
          vtkErrorMacro("Gdcm cannot parse file " << filename->c_str());
@@ -612,7 +612,7 @@ size_t vtkGdcmReader::LoadImageInMemory(
              unsigned long & updateProgressCount)
 {
    vtkDebugMacro("Copying to memory image [" << fileName.c_str() << "]");
-   gdcmFile file( fileName.c_str() );
+   gdcm::File file( fileName.c_str() );
    size_t size;
 
    // If the data structure of vtk for image/volume representation
@@ -633,7 +633,7 @@ size_t vtkGdcmReader::LoadImageInMemory(
    {
       size               = file.GetImageDataSizeRaw();
       source             = (unsigned char*) file.GetImageDataRaw();
-      unsigned char *lut =                  file.GetHeader()->GetLUTRGBA();
+      unsigned char *lut = (unsigned char*) file.GetLutRGBA();
 
       if(!this->LookupTable)
       {
@@ -690,7 +690,11 @@ size_t vtkGdcmReader::LoadImageInMemory(
 //   fclose(f2); 
    
    //GetImageData allocate a (void*)malloc, remove it:
-   delete[] pSource;
+
+   // CLEANME
+   // Now, the delete on values keep from GetImageData is useless (made in
+   // the PixelConvert class)
+   //delete[] pSource;
    return size;
 }