X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=b173a08846f7dfeec47b4e6a08a74b8d41c863e6;hb=721d134c6e594b9a23bf1ce002ed87bfbc1576a7;hp=524f0f98e76db7330d05815aa8bf882070327d97;hpb=6b51b22366f878e1050c75a6ebb755bd2ff365c7;p=gdcm.git

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 524f0f98..b173a088 100644
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/25 14:52:34 $
-  Version:   $Revision: 1.72 $
+  Date:      $Date: 2007/05/23 14:18:09 $
+  Version:   $Revision: 1.78 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,11 +18,12 @@
 
 #include "gdcmDictSet.h"
 #include "gdcmDebug.h"
+#include "gdcmGlobal.h"
 #include <fstream>
 #include <stdlib.h>  // For getenv
 #include <stdio.h>   // For sprintf
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 
 //-----------------------------------------------------------------------------
@@ -37,6 +38,8 @@ DictSet::DictSet()
    std::string pubDictFile(DictPath);
    pubDictFile += PUB_DICT_FILENAME;
    Dicts[PUB_DICT_NAME] = Dict::New(pubDictFile);
+   // Stored redundantly to avoid at access HTable DictSet every time.
+   Global::DefaultPubDict = Dicts[PUB_DICT_NAME];
 }
 
 /**
@@ -44,6 +47,7 @@ DictSet::DictSet()
  */
 DictSet::~DictSet() 
 {
+   Global::DefaultPubDict = 0; // just a pointer!
    // Remove dictionaries
    for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) 
    {
@@ -66,6 +70,8 @@ DictSet::~DictSet()
 Dict *DictSet::LoadDictFromFile(std::string const &filename, 
                                 DictKey const &name) 
 {
+   assert(Dicts.find(name)==Dicts.end());
+   ///\todo RemoveDict(name); when Dict already exist
    Dict *newDict = Dict::New(filename);
    Dicts[name] = newDict;
 
@@ -122,26 +128,24 @@ Dict *DictSet::GetNextDict()
  *          to "../Dicts/".
  * @return  path to directory containing the dictionaries
  */
-std::string DictSet::BuildDictPath() 
+std::string DictSet::BuildDictPath()
 {
    std::string resultPath;
-   const char *envPath;
-   envPath = getenv("GDCM_DICT_PATH");
+   const char *envPath = getenv("GDCM_DICT_PATH");
 
-   if (envPath && (strlen(envPath) != 0)) 
+   if (envPath && (strlen(envPath) != 0))
    {
       resultPath = envPath;
-      gdcmWarningMacro( "Dictionary path set from environnement");
-   } 
+      gdcmStaticWarningMacro( "Dictionary path set from environnement");
+   }
    else
    {
       resultPath = PUB_DICT_PATH;
    }
-   if ( resultPath[resultPath.length()-1] != '/' )
+   if ( resultPath.length() && resultPath[resultPath.length()-1] != '/' )
    {
       resultPath += '/';
    }
-
    return resultPath;
 }