Doxygenation

[gdcm.git] / src / gdcmDictSet.cxx

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 5993675bced31b532f20c4d800dffc684d1335f6..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/18 02:31:58 $
-  Version:   $Revision: 1.40 $
+  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();
 }
 
 //-----------------------------------------------------------------------------
@@ -136,7 +127,7 @@ EntryNamesByCatMap * DictSet::GetPubDictEntryNamesByCategory()
  * \ingroup DictSet
  * \brief   Loads a dictionary from a specified file, and add it
  *          to already the existing ones contained in this DictSet.
- * @param   fileName Absolute or relative filename containing the
+ * @param   filename Absolute or relative filename containing the
  *          dictionary to load.
  * @param   name Symbolic name that be used as identifier of the newly 
  *          created dictionary.
@@ -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;
 }
 
 //-----------------------------------------------------------------------------