X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmGlobal.cxx;h=ef16d2b9a9488d328c10205b4c600b57d86f3432;hb=fa5a54cab56f2bc97169faf1dc0eaf4283ce2d75;hp=bf364f995e537d9f9ad57cb308a9907d1e757c70;hpb=65ff027090c4ba4697b5ad252fe09b1cc79a6cc8;p=gdcm.git diff --git a/src/gdcmGlobal.cxx b/src/gdcmGlobal.cxx index bf364f99..ef16d2b9 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/07/06 15:08:10 $ - Version: $Revision: 1.33 $ + Date: $Date: 2007/07/04 15:38:53 $ + Version: $Revision: 1.36 $ 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 @@ -35,13 +35,13 @@ namespace gdcm /// Therefore the actual initialization is done in a cxx file (avoid /// duplicated symbol), and an extern is used in gdcmCommon.h -const std::string GDCM_UNKNOWN = "gdcm::Unknown"; -const std::string GDCM_UNFOUND = "gdcm::Unfound"; -const std::string GDCM_BINLOADED = "gdcm::Binary data loaded"; -const std::string GDCM_NOTLOADED = "gdcm::NotLoaded"; -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_UNKNOWN = "GDCM::Unknown"; +const std::string GDCM_UNFOUND = "GDCM::Unfound"; +const std::string GDCM_BINLOADED = "GDCM::Binary data loaded"; +const std::string GDCM_NOTLOADED = "GDCM::NotLoaded"; +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 char GDCM_VRUNKNOWN[2] = {' ',' '}; // avoid useless std::string stuff