ENH:

[gdcm.git] / src / gdcmDict.cxx

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index 01acd68d5f82eab8835e9ea16297fa258fc16fa6..7155f6ef3621aab04c5e1c0919531d24804c5ce1 100644 (file)
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDict.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/27 22:31:12 $
-  Version:   $Revision: 1.48 $
+  Date:      $Date: 2004/10/28 19:53:28 $
+  Version:   $Revision: 1.50 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -68,14 +68,6 @@ Dict::Dict(std::string const & filename)
  */
 Dict::~Dict()
 {
-/*   for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag)
-   {
-      DictEntry* entryToDelete = tag->second;
-      if ( entryToDelete )
-      {
-         delete entryToDelete;
-      }
-   }*/
    // Since AddNewEntry adds symetrical in both KeyHt and NameHT we can
    // assume all the pointed DictEntries are already cleaned-up when
    // we cleaned KeyHt.
@@ -161,13 +153,11 @@ bool Dict::AddNewEntry(DictEntry const & newEntry)
    } 
    else 
    {
-      //KeyHt[newEntry.GetKey()] = newEntry;
       KeyHt.insert( 
-         TagKeyHT::value_type<TagKey, DictEntry>
+         std::map<TagKey, DictEntry>::value_type
             (newEntry.GetKey(), newEntry));
-      //NameHt[newEntry.GetName()] = newEntry;
       NameHt.insert(
-         TagNameHT::value_type<TagName, DictEntry>
+         std::map<TagName, DictEntry>::value_type
             (newEntry.GetName(), newEntry ));
       return true;
    }
@@ -183,13 +173,11 @@ bool Dict::ReplaceEntry(DictEntry const & newEntry)
 {
    if ( RemoveEntry(newEntry.GetKey()) )
    {
-      //KeyHt[newEntry.GetKey()] = newEntry;
       KeyHt.insert( 
-         TagKeyHT::value_type<TagKey, DictEntry>
+         std::map<TagKey, DictEntry>::value_type
             (newEntry.GetKey(), newEntry));
-      //NameHt[newEntry.GetName()] = newEntry;
       NameHt.insert(
-         TagNameHT::value_type<TagName, DictEntry>
+         std::map<TagName, DictEntry>::value_type
             (newEntry.GetName(), newEntry ));
        return true;
    } 
@@ -237,7 +225,7 @@ bool Dict::RemoveEntry (uint16_t group, uint16_t element)
  * \brief   Get the dictionnary entry identified by it's name.
  * @param   name element of the ElVal to modify
  * \warning : NEVER use it !
- *            the 'name' IS NOT an identifier within the Dicom Dicom Dictionary
+ *            the 'name' IS NOT an identifier within the Dicom Dictionary
  *            the name MAY CHANGE between two versions !
  * @return  the corresponding dictionnary entry when existing, NULL otherwise
  */