X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.h;h=9e2e2d777580a759e99c168c6a4d5d67d0e32a82;hb=6278320cc85da00d2d56ffbf07806e84966892c3;hp=e9d3bcbc0676f9c0e400b11d21269c439e4e3f52;hpb=46afb30d2d016a9b1581c7ee4ca96d614a35203c;p=gdcm.git diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h index e9d3bcbc..9e2e2d77 100644 --- a/src/gdcmDictSet.h +++ b/src/gdcmDictSet.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDictSet.h,v $ Language: C++ - Date: $Date: 2005/11/28 15:20:33 $ - Version: $Revision: 1.51 $ + Date: $Date: 2007/08/22 16:14:04 $ + Version: $Revision: 1.55 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,16 +16,17 @@ =========================================================================*/ -#ifndef GDCMDICTSET_H -#define GDCMDICTSET_H +#ifndef _GDCMDICTSET_H +#define _GDCMDICTSET_H -#include "gdcmCommandManager.h" +#include "gdcmRefCounter.h" #include "gdcmDict.h" +#include "gdcmGlobal.h" #include #include -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- typedef std::map DictSetHT; @@ -38,7 +39,7 @@ typedef std::map DictSetHT; * - having many in memory representations of the same dictionary * (saving memory). */ -class GDCM_EXPORT DictSet : public CommandManager +class GDCM_EXPORT DictSet : public RefCounter { gdcmTypeMacro(DictSet); @@ -58,8 +59,9 @@ public: Dict *GetDict( DictKey const &DictName ); /// \brief Returns the default reference DICOM V3 public dictionary. - Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); } - + //Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); } + Dict* GetDefaultPubDict() { return Global::DefaultPubDict; } + // \ brief Returns the virtual references DICOM dictionary. // \ warning : not end user intended // Dict *GetVirtualDict() { return &VirtualEntries; }