X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmGlobal.cxx;h=0229c8edba9a738afa67f594e3da9bf647607a6d;hb=3370a8090c600a3d4dbe5573a62d1dddb59819f2;hp=f6278f622705beef9b621e6a7958d48601fdfc06;hpb=2012716d624d631dcdb825fdd4470908e115a717;p=gdcm.git diff --git a/src/gdcmGlobal.cxx b/src/gdcmGlobal.cxx index f6278f62..0229c8ed 100644 --- a/src/gdcmGlobal.cxx +++ b/src/gdcmGlobal.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmGlobal.cxx,v $ Language: C++ - Date: $Date: 2004/06/20 18:08:47 $ - Version: $Revision: 1.2 $ + Date: $Date: 2004/10/08 04:52:55 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -18,9 +18,6 @@ #include "gdcmGlobal.h" #include "gdcmDebug.h" -#include -#include // For isspace -#include // CLEANME: could this be only string ? Related to Win32 ? /** * \ingroup Globals @@ -58,9 +55,12 @@ gdcmGlobal gdcmGlob; * \ingroup gdcmGlobal * \brief constructor : populates the various H Tables */ -gdcmGlobal::gdcmGlobal(void) { +gdcmGlobal::gdcmGlobal() +{ if (VR || TS || Dicts || ddElem) + { dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts already allocated"); + } Dicts = new gdcmDictSet(); VR = new gdcmVR(); TS = new gdcmTS(); @@ -71,7 +71,8 @@ gdcmGlobal::gdcmGlobal(void) { * \ingroup gdcmGlobal * \brief canonical destructor */ -gdcmGlobal::~gdcmGlobal() { +gdcmGlobal::~gdcmGlobal() +{ delete Dicts; delete VR; delete TS; @@ -81,27 +82,31 @@ gdcmGlobal::~gdcmGlobal() { * \ingroup gdcmGlobal * \brief returns a pointer to the 'Value Representation Table' */ -gdcmVR *gdcmGlobal::GetVR(void) { +gdcmVR *gdcmGlobal::GetVR() +{ return VR; } /** * \ingroup gdcmGlobal * \brief returns a pointer to the 'Transfert Syntax Table' */ -gdcmTS *gdcmGlobal::GetTS(void) { +gdcmTS *gdcmGlobal::GetTS() +{ return TS; } /** * \ingroup gdcmGlobal * \brief returns a pointer to Dictionaries Table */ -gdcmDictSet *gdcmGlobal::GetDicts(void) { +gdcmDictSet *gdcmGlobal::GetDicts() +{ return Dicts; } /** * \ingroup gdcmGlobal * \brief returns a pointer to the DicomDir related elements Table */ -gdcmDicomDirElement *gdcmGlobal::GetDicomDirElements(void) { +gdcmDicomDirElement *gdcmGlobal::GetDicomDirElements() +{ return ddElem; }