X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmGlobal.cxx;h=2f523fc2eaa8234e11928b82b835945145461f88;hb=5d1e3fd08029804ede29b7392c2f1b7970b3c27f;hp=ad98da2c862a37e843e03293cb57b92636705c9d;hpb=8de85686746ce345645a999e870362f3043cab56;p=gdcm.git diff --git a/src/gdcmGlobal.cxx b/src/gdcmGlobal.cxx index ad98da2c..2f523fc2 100644 --- a/src/gdcmGlobal.cxx +++ b/src/gdcmGlobal.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmGlobal.cxx,v $ Language: C++ - Date: $Date: 2006/01/11 10:44:24 $ - Version: $Revision: 1.31 $ + Date: $Date: 2007/05/23 14:18:10 $ + Version: $Revision: 1.34 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -25,7 +25,7 @@ #include "gdcmDictSet.h" #include "gdcmDicomDirElement.h" -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- /// \brief Those global string that are returned by reference everywhere in @@ -43,7 +43,7 @@ const std::string GDCM_UNREAD = "gdcm::UnRead"; const std::string GDCM_NOTASCII = "gdcm::NotAscii"; const std::string GDCM_PIXELDATA = "gdcm::Pixel Data to be loaded"; -const std::string GDCM_VRUNKNOWN = " "; +const char GDCM_VRUNKNOWN[2] = {' ',' '}; // avoid useless std::string stuff #ifdef _WIN32 const char GDCM_FILESEPARATOR = '\\'; @@ -58,6 +58,8 @@ TS *Global::TranSyn = (TS *)0; DictGroupName *Global::GroupName = (DictGroupName *)0; DicomDirElement *Global::ddElem = (DicomDirElement *)0; +Dict *Global::DefaultPubDict = (Dict *)0; + //----------------------------------------------------------------------------- /** * \brief Global container