Program: gdcm
Module: $RCSfile: gdcmDictSet.cxx,v $
Language: C++
- Date: $Date: 2006/03/22 13:19:25 $
- Version: $Revision: 1.74 $
+ 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
#include <stdlib.h> // For getenv
#include <stdio.h> // For sprintf
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
*/
DictSet::~DictSet()
{
+ Global::DefaultPubDict = 0; // just a pointer!
// Remove dictionaries
for (DictSetHT::iterator tag = Dicts.begin(); tag != Dicts.end(); ++tag)
{
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;
* 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;
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;
}