X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmGlobal.cxx;h=4a21aca32e87b949f204e6851c56b7c55b7cf197;hb=4ef8257270e9d499e8c5ece74c4582bcb6c3f6a4;hp=704bc3f88222518307bdf5cf043ba9808a832378;hpb=d660de8252252f981699115eac611a8ec0b3ad5f;p=gdcm.git diff --git a/src/gdcmGlobal.cxx b/src/gdcmGlobal.cxx index 704bc3f8..4a21aca3 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/06/06 12:37:58 $ - Version: $Revision: 1.24 $ + Date: $Date: 2005/10/25 14:52:35 $ + Version: $Revision: 1.28 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -40,6 +40,10 @@ 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_VRUNKNOWN = " "; //----------------------------------------------------------------------------- DictSet *Global::Dicts = (DictSet *)0; @@ -66,11 +70,11 @@ Global::Global() gdcmWarningMacro( "VR or TS or Dicts already allocated"); return; } - Dicts = new DictSet(); - ValRes = new VR(); - TranSyn = new TS(); - GroupName = new DictGroupName(); - ddElem = new DicomDirElement(); + Dicts = DictSet::New(); + ValRes = VR::New(); + TranSyn = TS::New(); + GroupName = DictGroupName::New(); + ddElem = DicomDirElement::New(); } /** @@ -78,11 +82,11 @@ Global::Global() */ Global::~Global() { - delete Dicts; - delete ValRes; - delete TranSyn; - delete GroupName; - delete ddElem; + Dicts->Delete(); + ValRes->Delete(); + TranSyn->Delete(); + GroupName->Delete(); + ddElem->Delete(); } //-----------------------------------------------------------------------------