BUG: Remove demangle code this was seg faulting on some linux gcc 3.3.2 machine

[gdcm.git] / src / gdcmDictSet.cxx

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index e03a01a4d242b372d6ce2ec6f34ea09e06ecb99a..3b3c53c6ee9eff6b7fa79e9653f2e32d9d770f82 100644 (file)
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/20 14:30:40 $
-  Version:   $Revision: 1.41 $
+  Date:      $Date: 2004/10/28 19:53:29 $
+  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
@@ -58,16 +58,7 @@ DictSet::~DictSet()
    Dicts.clear();
 
    // Remove virtual dictionnary entries
-   std::map<std::string,DictEntry *>::iterator it;
-   for(it = VirtualEntry.begin(); it != VirtualEntry.end(); ++it)
-   {
-      DictEntry *entry = it->second;
-      if ( entry )
-      {
-         delete entry;
-      }
-      it->second = NULL;
-   }
+   VirtualEntry.clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -178,20 +169,23 @@ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
                                          TagName fourth,
                                          TagName name)
 {
-   DictEntry* entry;
+   DictEntry *entry;
    const std::string tag = DictEntry::TranslateToKey(group,element)
                            + "#" + vr + "#" + fourth + "#" + name;
-   std::map<std::string,DictEntry *>::iterator it;
+   TagKeyHT::iterator it;
    
    it = VirtualEntry.find(tag);
    if(it != VirtualEntry.end())
    {
-      entry = it->second;
+      entry = &(it->second);
    }
    else
    {
-      entry = new DictEntry(group, element, vr, fourth, name);
-      VirtualEntry[tag] = entry;
+      DictEntry ent(group, element, vr, fourth, name);
+      VirtualEntry.insert(
+         std::map<TagKey, DictEntry>::value_type
+            (tag, ent));
+      entry = &(VirtualEntry.find(tag)->second);
    }
 
    return entry;
@@ -234,7 +228,7 @@ bool DictSet::AppendDict(Dict *newDict, DictKey const & name)
 {
    Dicts[name] = newDict;
 
-   return true;   //FIXME
+   return true;
 }
 
 //-----------------------------------------------------------------------------