* Fix memory leaks

   -- BeNours

diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx
index 3bb432b8f78957386fad2087e84b2a9e83a2e9c7..24281df6b15465231db78939ff56fc97163b8f1e 100644 (file)
--- 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 adbf55ca0f9b93eff31f42a0a8031e0000e6d515..e2326b53faf0abf8d6af3649d64fcfa207fd5c36 100644 (file)
--- 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;
 }
 
 //-----------------------------------------------------------------------------