* vtk/vtkGdcmReader[cxx|h] : makes correct code to remove conflicts

[gdcm.git] / src / gdcmUtil.cxx

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 9b93e96cef69cb519e7e5e2fc4e24183faec1856..1c521040b7e4ec7916a33d4f558dec67a960eb70 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,11 +1,11 @@
-// gdcmUtil.cxx
+// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.11 2003/05/21 16:26:28 regrain Exp $
 
 #include <ctype.h>   // For isspace
 #include "gdcmUtil.h"
+using namespace std;
 
 // Library globals.
 gdcmDebug dbg;
-gdcmVR * gdcmGlobal::VR = new gdcmVR();
 
 gdcmDebug::gdcmDebug(int level) {
        DebugLevel = level;
@@ -48,17 +48,30 @@ void gdcmDebug::Exit(int a) {
 }
 
 ///////////////////////////////////////////////////////////////////////////
+gdcmVR      * gdcmGlobal::VR    = (gdcmVR*)0;
+gdcmDictSet * gdcmGlobal::Dicts = (gdcmDictSet*)0;
+gdcmGlobal gdcmGlob;
+
 gdcmGlobal::gdcmGlobal(void) {
+   if (VR || Dicts)
+      dbg.Verbose(0, "gdcmGlobal::gdcmGlobal: VR or Dicts allready allocated");
+   VR = new gdcmVR();
+   Dicts = new gdcmDictSet();
 }
 
-gdcmGlobal::~gdcmGlobal(void) {
+gdcmGlobal::~gdcmGlobal() {
    delete VR;
+   delete Dicts;
 }
 
 gdcmVR * gdcmGlobal::GetVR(void) {
    return VR;
 }
 
+gdcmDictSet * gdcmGlobal::GetDicts(void) {
+   return Dicts;
+}
+
 ///////////////////////////////////////////////////////////////////////////
 // Because is not yet available in g++2.96
 istream& eatwhite(istream& is) {