* src/gdcmDocument.cxx: gdcmDocument::~gdcmDocument() doesn't clear (nor

    clear) TagHT, which is an inherited member of gdcmElementSet. It is
    up to the destructor of gdcmElementSet to clean up TagHt and it's
    pointed content.

diff --git a/ChangeLog b/ChangeLog
index c5f8b091e753d0b79f74e9fb0d0d08cc19635b68..b825eda10eadfbaac73ed4d3b23e7f4f5738ce39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-22 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
+  * src/gdcmDocument.cxx: gdcmDocument::~gdcmDocument() doesn't clear (nor
+    clear) TagHT, which is an inherited member of gdcmElementSet. It is
+    up to the destructor of gdcmElementSet to clean up TagHt and it's
+    pointed content.
+
 2004-09-21 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
   * Test/CMakeLists.txt: update to follow gdcmData renamings.
   * src/gdcmCommon.h, gdcmDocument.cxx: doxygen typos

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 954b5e4096bb5e2568a7d5773ed88602d910a021..c355fd4e78a38b2b384939c40ff7c115eeedf119 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/09/22 10:34:53 $
-  Version:   $Revision: 1.86 $
+  Date:      $Date: 2004/09/22 21:01:55 $
+  Version:   $Revision: 1.87 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -192,16 +192,8 @@ gdcmDocument::gdcmDocument()
  */
 gdcmDocument::~gdcmDocument ()
 {
-   RefPubDict = NULL;
-   RefShaDict = NULL;
-
-   // Recursive clean up of sequences
-   for (TagDocEntryHT::const_iterator it = TagHT.begin(); 
-                                      it != TagHT.end(); ++it )
-   { 
-      //delete it->second; //temp remove
-   }
-   TagHT.clear();
+   RefPubDict = 0;
+   RefShaDict = 0;
 }
 
 //-----------------------------------------------------------------------------