X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=751be5f83e208322cd4b9b57541dc182901ac51c;hb=66553b88cd6daaac48ac62a910199cb2fff276f6;hp=3ccc09d97f26fbcc36953643644b4d9f0e428100;hpb=d74d6412b83d9f596597b54c3413d1a6ee9fb617;p=gdcm.git

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 3ccc09d9..751be5f8 100644
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -20,18 +20,16 @@ typedef map<DictKey, gdcmDict*> DictSetHT;
  */
 class GDCM_EXPORT gdcmDictSet {
 private:
-	DictSetHT dicts;
+   /// Hash table of all dictionaries contained in this gdcmDictSet
+	DictSetHT Dicts;
+   /// Directory path to dictionaries
+	string DictPath;
 	int AppendDict(gdcmDict* NewDict);
 	void LoadDictFromFile(string filename, DictKey);
-private:
-   /// Directory path to dictionaries
-	static string DictPath;
-	static string BuildDictPath(void);
-	static gdcmDict* DefaultPubDict;
+	string BuildDictPath(void);
 public:
-	static list<string> * GetPubDictTagNames(void);
-	static map<string, list<string> >* GetPubDictTagNamesByCategory(void);
-	static gdcmDict* LoadDefaultPubDict(void);
+	list<string> * GetPubDictTagNames(void);
+	map<string, list<string> >* GetPubDictTagNamesByCategory(void);
 
 	// TODO Swig int LoadDictFromFile(string filename);
    // QUESTION: the following function might not be thread safe !? Maybe
@@ -41,6 +39,7 @@ public:
 	// TODO Swig int LoadAllDictFromDirectory(string DirectoryName);
 	// TODO Swig string* GetAllDictNames();
 	gdcmDictSet(void);
+	~gdcmDictSet(void);
 	void Print(ostream&);
 	gdcmDict* GetDict(DictKey DictName);
 	gdcmDict* GetDefaultPubDict(void);