FIX :

    gdcmElementSet::RemoveEntry() now removes the entry from the H Table
ADD :
   gdcmElementSet::RemoveEntryNoDestroy() removes the entry, without deletion

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index ec3f2b436f923ce91373b76363e0e4cd92f1b74a..a5017dd6194bb679a0f41ac30078762007daed3d 100644 (file)
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/31 14:24:47 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2004/09/03 14:04:02 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -123,9 +123,27 @@ bool gdcmElementSet::AddEntry( gdcmDocEntry *newEntry)
 }
 
 /**
- * \brief   Clear the hash table from given entry.
+ * \brief   Clear the hash table from given entry BUT keep the entry.
  * @param   entryToRemove Entry to remove.
  */
+bool gdcmElementSet::RemoveEntryNoDestroy( gdcmDocEntry *entryToRemove)
+{
+   gdcmTagKey key = entryToRemove->GetKey();
+   if( TagHT.count(key) == 1 )
+   {
+      TagHT.erase(key);
+      dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased.");
+      return true;
+   }
+
+   dbg.Verbose(0, "gdcmElementSet::RemoveEntry: key not present: ");
+   return false ;
+}
+
+/**
+ * \brief   Clear the hash table from given entry AND delete the entry.
+ * @param   entryToRemove Entry to remove AND delete.
+ */
 bool gdcmElementSet::RemoveEntry( gdcmDocEntry *entryToRemove)
 {
    gdcmTagKey key = entryToRemove->GetKey();
@@ -133,6 +151,7 @@ bool gdcmElementSet::RemoveEntry( gdcmDocEntry *entryToRemove)
    {
       TagHT.erase(key);
       dbg.Verbose(0, "gdcmElementSet::RemoveEntry: one element erased.");
+      delete entryToRemove;
       return true;
    }
 

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index df53414689ba4092a7debf80d45c1491547b98b2..0ed6c70b1db735ffebb281164fe4390727e8ab85 100644 (file)
--- a/src/gdcmElementSet.h
+++ b/src/gdcmElementSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.h,v $
   Language:  C++
-  Date:      $Date: 2004/09/03 07:57:10 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2004/09/03 14:04:02 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,8 +39,9 @@ public:
    gdcmElementSet(int);
    ~gdcmElementSet();
    virtual bool AddEntry(gdcmDocEntry *Entry);
-   virtual bool RemoveEntry(gdcmDocEntry *EntryToRemove);
-
+   bool RemoveEntry(gdcmDocEntry *EntryToRemove);
+   bool RemoveEntryNoDestroy(gdcmDocEntry *EntryToRemove);
+   
    virtual void Print(std::ostream &os = std::cout); 
    virtual void Write(FILE *fp, FileType filetype);