Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2004/11/03 20:52:13 $
- Version: $Revision: 1.151 $
+ Date: $Date: 2004/11/15 15:29:04 $
+ Version: $Revision: 1.154 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
void File::Initialise()
{
+ PixelConverter = NULL; //just in case
if ( HeaderInternal->IsReadable() )
{
ImageDataSizeRaw = ComputeDecompressedPixelDataSizeFromHeader();
ImageDataSize = ImageDataSizeRaw;
}
- PixelConverter = new PixelConvert;
+ PixelConverter = new PixelConvert; //LEAK !
PixelConverter->GrabInformationsFromHeader( HeaderInternal );
}
SaveInitialValues();
HeaderInternal = 0;
DeleteInitialValues();
+ if( PixelConverter )
+ {
+ delete PixelConverter;
+ }
+
}
/**
// The decompressed image migth not be loaded yet:
std::ifstream* fp = HeaderInternal->OpenFile();
PixelConverter->ReadAndDecompressPixelData( fp );
- HeaderInternal->CloseFile();
+ if(fp) HeaderInternal->CloseFile();
decompressed = PixelConverter->GetDecompressed();
if ( ! decompressed )
{
}
// ----------------- End of Special Patch ----------------
fp1->close ();
+ delete fp1;
return true;
}