// //////////////////////////////////////////////////////////////
#include "gdcmFile.h"
-#include "gdcmHeaderHelper.h"
+#include "gdcmHeader.h"
#include "vtkGdcmReader.h"
//#include <stdio.h>
#include <vtkPointData.h>
#include <vtkLookupTable.h>
-vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.51 $");
+vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.57 $");
vtkStandardNewMacro(vtkGdcmReader);
//-----------------------------------------------------------------------------
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)
if( file.GetHeader()->HasLUT() && AllowLookupTable )
{
- size = file.GetImageDataSizeRaw();
+ size = file.GetImageDataSize();
source = (unsigned char*) file.GetImageDataRaw();
- unsigned char *lut = file.GetHeader()->GetLUTRGBA();
+ unsigned char *lut = (unsigned char*) file.GetLutRGBA();
if(!this->LookupTable)
{
source = (unsigned char*)file.GetImageData();
}
- unsigned char * pSource = source; //pointer for later deletion
unsigned char * destination = dest + size - lineSize;
for (int plane = 0; plane < numPlanes; plane++)
// fwrite(Dest,size,1,f2);
// fclose(f2);
- //GetImageData allocate a (void*)malloc, remove it:
- delete[] pSource;
return size;
}