X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmGlobal.cxx;h=4a21aca32e87b949f204e6851c56b7c55b7cf197;hb=6685f35f9cd58b5d14d39de46e910fc5c5cfc5db;hp=994185b513017e9f054e4b7f143efa03e8f5a983;hpb=f8287c00c0a0c448eade55158a63f1d44eeb06e0;p=gdcm.git diff --git a/src/gdcmGlobal.cxx b/src/gdcmGlobal.cxx index 994185b5..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/09/06 15:31:17 $ - Version: $Revision: 1.25 $ + 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 @@ -41,6 +41,10 @@ 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; VR *Global::ValRes = (VR *)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(); } //-----------------------------------------------------------------------------