X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.cxx;h=1e0852bdbab52c64923cf2d9c62321b20455b80e;hb=2fde1103e77a2448cce41d061781d0ec89ef239b;hp=426018c05a8eb1fb023e37a5306ceaffafeb2d78;hpb=8fb1011e6fca9654c69d4921642f18146c66ca7f;p=gdcm.git diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx index 426018c0..1e0852bd 100644 --- a/vtk/vtkGdcmReader.cxx +++ b/vtk/vtkGdcmReader.cxx @@ -1,4 +1,4 @@ -// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.cxx,v 1.27 2003/11/12 14:06:36 malaterre Exp $ +// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.cxx,v 1.29 2003/12/22 12:46:19 regrain Exp $ // ////////////////////////////////////////////////////////////// // WARNING TODO CLENAME // Actual limitations of this code: @@ -471,17 +471,17 @@ size_t vtkGdcmReader::LoadImageInMemory( // But vtk chooses to invert the lines of an image, that is the last // line comes first (for some axis related reasons?). Hence we need // to load the image line by line, starting from the end. - int NumColumns = GdcmFile.GetXSize(); - int NumLines = GdcmFile.GetYSize(); - int NumPlanes = GdcmFile.GetZSize(); - int LineSize = NumComponents * NumColumns * GdcmFile.GetPixelSize(); + int NumColumns = GdcmFile.GetHeader()->GetXSize(); + int NumLines = GdcmFile.GetHeader()->GetYSize(); + int NumPlanes = GdcmFile.GetHeader()->GetZSize(); + int LineSize = NumComponents * NumColumns * GdcmFile.GetHeader()->GetPixelSize(); unsigned char * Source; - if( GdcmFile.HasLUT() ) + if( GdcmFile.GetHeader()->HasLUT() ) { size = GdcmFile.GetImageDataSizeRaw(); Source = (unsigned char*) GdcmFile.GetImageDataRaw(); - unsigned char *Lut = (unsigned char*) GdcmFile.GetLUTRGBA(); + unsigned char *Lut = GdcmFile.GetHeader()->GetLUTRGBA(); if(!this->LookupTable) this->LookupTable = vtkLookupTable::New(); this->LookupTable->SetNumberOfTableValues(256);