From f14e091ab076314a54459f1b2b0efeaa03a2bc56 Mon Sep 17 00:00:00 2001 From: regrain Date: Wed, 26 Oct 2005 08:28:56 +0000 Subject: [PATCH] * Fix memory leaks -- BeNours --- Testing/TestWriteSimple.cxx | 8 +++----- src/gdcmFileHelper.cxx | 9 +++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx index 3bb432b8..24281df6 100644 --- a/Testing/TestWriteSimple.cxx +++ b/Testing/TestWriteSimple.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestWriteSimple.cxx,v $ Language: C++ - Date: $Date: 2005/10/25 16:43:46 $ - Version: $Revision: 1.43 $ + Date: $Date: 2005/10/26 08:28:56 $ + Version: $Revision: 1.44 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -113,8 +113,7 @@ int WriteSimple(Image &img) gdcm::FileHelper *fileH = gdcm::FileHelper::New(); // Get the (empty) image header. - gdcm::File *fileToBuild = fileH->GetFile() - ; + gdcm::File *fileToBuild = fileH->GetFile(); std::ostringstream str; // Set the image size @@ -361,7 +360,6 @@ int WriteSimple(Image &img) std::cout << "OK" << std::endl; - fileToBuild->Delete(); fileH->Delete(); reread->Delete(); delete[] imageData; diff --git a/src/gdcmFileHelper.cxx b/src/gdcmFileHelper.cxx index adbf55ca..e2326b53 100644 --- a/src/gdcmFileHelper.cxx +++ b/src/gdcmFileHelper.cxx @@ -4,8 +4,8 @@ Module: $RCSfile: gdcmFileHelper.cxx,v $ Language: C++ - Date: $Date: 2005/10/26 06:08:24 $ - Version: $Revision: 1.75 $ + Date: $Date: 2005/10/26 08:28:58 $ + Version: $Revision: 1.76 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -150,8 +150,10 @@ FileHelper::FileHelper( ) */ FileHelper::FileHelper(File *header) { + gdcmAssertMacro(header); + FileInternal = header; - header->Register(); + FileInternal->Register(); Initialize(); if ( FileInternal->IsReadable() ) { @@ -180,7 +182,6 @@ FileHelper::~FileHelper() } FileInternal->Unregister(); - FileInternal = 0; } //----------------------------------------------------------------------------- -- 2.45.1