*** empty log message ***

[gdcm.git] / src / gdcmDictSet.cxx

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index afe0b0799212e1746bc5e576db02d11eb7273d74..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/27 22:31:12 $
-  Version:   $Revision: 1.42 $
+  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
-/*   TagKeyHT::iterator it;
-   for(it = VirtualEntry.begin(); it != VirtualEntry.end(); ++it)
-   {
-      DictEntry entry = it->second;
-      if ( entry )
-      {
-         delete entry;
-      }
-      it->second = NULL;
-   }*/
+   VirtualEntry.clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -191,9 +182,8 @@ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
    else
    {
       DictEntry ent(group, element, vr, fourth, name);
-      //VirtualEntry[tag] = entry;
       VirtualEntry.insert(
-         TagKeyHT::value_type<TagKey, DictEntry>
+         std::map<TagKey, DictEntry>::value_type
             (tag, ent));
       entry = &(VirtualEntry.find(tag)->second);
    }
@@ -238,7 +228,7 @@ bool DictSet::AppendDict(Dict *newDict, DictKey const & name)
 {
    Dicts[name] = newDict;
 
-   return true;   //FIXME
+   return true;
 }
 
 //-----------------------------------------------------------------------------