Fix mistypings

[gdcm.git] / src / gdcmDictSet.cxx

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 32a5023a73c2f85391bc159403fe899d852da4c1..b173a08846f7dfeec47b4e6a08a74b8d41c863e6 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: 2005/10/20 15:24:08 $
-  Version:   $Revision: 1.71 $
+  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 
 {
 
 //-----------------------------------------------------------------------------
@@ -36,7 +37,9 @@ DictSet::DictSet()
    DictPath = BuildDictPath();
    std::string pubDictFile(DictPath);
    pubDictFile += PUB_DICT_FILENAME;
-   Dicts[PUB_DICT_NAME] = new Dict(pubDictFile);
+   Dicts[PUB_DICT_NAME] = Dict::New(pubDictFile);
+   // Stored redundantly to avoid at access HTable DictSet every time.
+   Global::DefaultPubDict = Dicts[PUB_DICT_NAME];
 }
 
 /**
@@ -44,15 +47,12 @@ DictSet::DictSet()
  */
 DictSet::~DictSet() 
 {
+   Global::DefaultPubDict = 0; // just a pointer!
    // Remove dictionaries
    for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag) 
    {
-      Dict *entryToDelete = tag->second;
-      if ( entryToDelete )
-      {
-         delete entryToDelete;
-      }
-      tag->second = NULL;
+      if ( tag->second )
+         tag->second->Delete();
    }
    Dicts.clear();
 }
@@ -70,8 +70,10 @@ DictSet::~DictSet()
 Dict *DictSet::LoadDictFromFile(std::string const &filename, 
                                 DictKey const &name) 
 {
-   Dict *newDict = new Dict(filename);
-   AppendDict(newDict, name);
+   assert(Dicts.find(name)==Dicts.end());
+   ///\todo RemoveDict(name); when Dict already exist
+   Dict *newDict = Dict::New(filename);
+   Dicts[name] = newDict;
 
    return newDict;
 }
@@ -126,41 +128,29 @@ 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;
 }
 
 //-----------------------------------------------------------------------------
 // Protected
-/**
- * \brief   Adds a Dictionary to a DictSet
- * \return  always true
- */
-bool DictSet::AppendDict(Dict *newDict, DictKey const &name)
-{
-   Dicts[name] = newDict;
-
-   return true;
-}
 
 //-----------------------------------------------------------------------------
 // Private