X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.h;h=b7c3c5bc0da29b9d4bfc4168d6b6d545537f8682;hb=74e3bc05fade5a18f193e7d1122c74756c0e689e;hp=8f1c8379e715fc39bb85c24f2c979c1ebfbe837b;hpb=2fcc61952e680d58840c7ab1d2f09bbab7eff84f;p=gdcm.git

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index 8f1c8379..b7c3c5bc 100644
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDict.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/18 02:31:58 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2004/12/16 13:46:37 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,7 +19,7 @@
 #ifndef GDCMDICT_H
 #define GDCMDICT_H
 
-#include "gdcmCommon.h"
+#include "gdcmBase.h"
 #include "gdcmDictEntry.h"
 
 #include <iostream>
@@ -30,10 +30,12 @@ namespace gdcm
 {
 
 //-----------------------------------------------------------------------------
-typedef std::map<TagKey, DictEntry*> TagKeyHT;
-typedef std::map<TagName, DictEntry*> TagNameHT;
-typedef std::list<std::string>        EntryNamesList;
-typedef std::map<std::string, std::list<std::string> > EntryNamesByCatMap;
+typedef std::string DictKey;
+typedef std::map<TagKey, DictEntry>  TagKeyHT;
+typedef std::map<TagName, DictEntry> TagNameHT;
+typedef std::list<std::string>       EntryNamesList;
+typedef std::map<std::string, 
+            std::list<std::string> > EntryNamesByCatMap;
 //-----------------------------------------------------------------------------
 /*
  * \defgroup Dict
@@ -45,7 +47,7 @@ typedef std::map<std::string, std::list<std::string> > EntryNamesByCatMap;
  *           combined with all software versions...
  * \see DictSet
  */
-class GDCM_EXPORT Dict
+class GDCM_EXPORT Dict : public Base
 {
 public:
    Dict(std::string const & filename);
@@ -57,8 +59,8 @@ public:
    void PrintByName(std::ostream &os = std::cout);
 
 // Entries
-   bool AddNewEntry (DictEntry *newEntry);
-   bool ReplaceEntry(DictEntry *newEntry);
+   bool AddNewEntry (DictEntry const & newEntry);
+   bool ReplaceEntry(DictEntry const & newEntry);
    bool RemoveEntry (TagKey const & key);
    bool RemoveEntry (uint16_t group, uint16_t element);