X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.cxx;h=a503fcb1f4282c44ec896facc12b72658a8ab0d7;hb=c6ba69601063d700de0937554bc79edfe8f6cd30;hp=7d3217754488051bc9cdc9b1114c850592430e30;hpb=011c930f8a79381b622abbd1306f9489695ff9cf;p=gdcm.git diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx index 7d321775..a503fcb1 100644 --- a/vtk/vtkGdcmReader.cxx +++ b/vtk/vtkGdcmReader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkGdcmReader.cxx,v $ Language: C++ - Date: $Date: 2005/09/07 08:45:52 $ - Version: $Revision: 1.81 $ + Date: $Date: 2005/09/20 08:50:57 $ + Version: $Revision: 1.84 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -69,7 +69,7 @@ #include #include -vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.81 $") +vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.84 $") vtkStandardNewMacro(vtkGdcmReader) //----------------------------------------------------------------------------- @@ -755,7 +755,7 @@ void vtkGdcmReader::LoadImageInMemory( numComponents = f->GetNumberOfScalarComponents(); //rgb or mono vtkDebugMacro(<< "numComponents:" << numComponents); vtkDebugMacro(<< "Copying to memory image [" << f->GetFileName().c_str() << "]"); - size_t size; + //size_t size; // If the data structure of vtk for image/volume representation // were straigthforwards the following would be enough: @@ -771,7 +771,8 @@ void vtkGdcmReader::LoadImageInMemory( if( fileH->GetFile()->HasLUT() && AllowLookupTable ) { - size = fileH->GetImageDataSize(); + // to avoid bcc 5.5 w + /*size = */ fileH->GetImageDataSize(); src = (unsigned char*) fileH->GetImageDataRaw(); unsigned char *lut = (unsigned char*) fileH->GetLutRGBA(); @@ -796,8 +797,9 @@ void vtkGdcmReader::LoadImageInMemory( } else { - size = fileH->GetImageDataSize(); - src = (unsigned char*)fileH->GetImageData(); + //size = fileH->GetImageDataSize(); + // useless - just an accessor; 'size' unused + src = (unsigned char*)fileH->GetImageData(); } unsigned char *dst = dest + planeSize - lineSize;