X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmGlobal.cxx;h=1a31c1c60ee27c4054f766ed7e345939c75a2797;hb=e51bf0565bbe4c0e269dd941cb4071ebde6012e4;hp=6411383e263f1013340426c33d55824ff3a8f6cf;hpb=ff8631dd8488e6604df635faf472ee85f5b8a4b6;p=gdcm.git diff --git a/src/gdcmGlobal.cxx b/src/gdcmGlobal.cxx index 6411383e..1a31c1c6 100644 --- a/src/gdcmGlobal.cxx +++ b/src/gdcmGlobal.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmGlobal.cxx,v $ Language: C++ - Date: $Date: 2005/02/02 15:07:41 $ - Version: $Revision: 1.18 $ + Date: $Date: 2005/02/11 15:22:18 $ + Version: $Revision: 1.21 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,12 +27,12 @@ namespace gdcm { //----------------------------------------------------------------------------- -// Those global string that are return by reference everywhere in gdcm code -// used to be in gdcmCommon.h but due to a 'bug' in gcc/MacOSX -// you cannot have static initialization in a multithreaded environment -// since there is a lazy construction everything got skrew up somehow -// Therefore the actual initialization is done in a cxx file (avoid -// duplicated symbol), and an extern is used in gdcmCommon.h +/// \brief Those global string that are return by reference everywhere in +/// gdcm code used to be in gdcmCommon.h but due to a 'bug' in gcc/MacOSX +/// you cannot have static initialization in a multithreaded environment +/// since there is a lazy construction everything got skrew up somehow +/// 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"; @@ -40,10 +40,10 @@ const std::string GDCM_NOTLOADED = "gdcm::NotLoaded"; const std::string GDCM_UNREAD = "gdcm::UnRead"; //----------------------------------------------------------------------------- -DictSet *Global::Dicts = (DictSet *)0; -VR *Global::ValRes = (VR *)0; -TS *Global::TranSyn = (TS *)0; -DicomDirElement *Global::ddElem = (DicomDirElement *)0; +DictSet *Global::Dicts = (DictSet *)0; +VR *Global::ValRes = (VR *)0; +TS *Global::TranSyn = (TS *)0; +DicomDirElement *Global::ddElem = (DicomDirElement *)0; //----------------------------------------------------------------------------- /** @@ -60,7 +60,7 @@ Global::Global() { if (ValRes || TranSyn || Dicts || ddElem) { - gdcmVerboseMacro( "VR or TS or Dicts already allocated"); + gdcmWarningMacro( "VR or TS or Dicts already allocated"); return; } Dicts = new DictSet();