Index: Utilities/gdcm/src/gdcmCommon.h
===================================================================
RCS file: /cvsroot/Insight/Insight/Utilities/gdcm/src/gdcmCommon.h,v
retrieving revision 1.20
diff -u -3 -p -r1.20 gdcmCommon.h
--- Utilities/gdcm/src/gdcmCommon.h     24 Feb 2005 19:01:09 -0000      1.20
+++ Utilities/gdcm/src/gdcmCommon.h     12 Sep 2005 19:10:21 -0000
@@ -93,11 +93,11 @@ namespace gdcm
 #define DICT_TS           "dicomTS.dic"
 #define DICT_VR           "dicomVR.dic"
 
-GDCM_EXPORT extern const std::string GDCM_UNKNOWN;
-GDCM_EXPORT extern const std::string GDCM_UNFOUND;
-GDCM_EXPORT extern const std::string GDCM_BINLOADED;
-GDCM_EXPORT extern const std::string GDCM_NOTLOADED;
-GDCM_EXPORT extern const std::string GDCM_UNREAD;
+GDCM_EXPORT extern const char GDCM_UNKNOWN[];
+GDCM_EXPORT extern const char GDCM_UNFOUND[];
+GDCM_EXPORT extern const char GDCM_BINLOADED[];
+GDCM_EXPORT extern const char GDCM_NOTLOADED[];
+GDCM_EXPORT extern const char GDCM_UNREAD[];
 
 /// \brief TagKey is made to hold an "universal" (as in URL, Universal
 ///        Ressource Locator) key to a DocEntry i.e. a dicom tag.
Index: Utilities/gdcm/src/gdcmGlobal.cxx
===================================================================
RCS file: /cvsroot/Insight/Insight/Utilities/gdcm/src/gdcmGlobal.cxx,v
retrieving revision 1.3
diff -u -3 -p -r1.3 gdcmGlobal.cxx
--- Utilities/gdcm/src/gdcmGlobal.cxx   24 Feb 2005 19:01:09 -0000      1.3
+++ Utilities/gdcm/src/gdcmGlobal.cxx   12 Sep 2005 19:10:21 -0000
@@ -33,11 +33,11 @@ namespace gdcm 
 /// 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";
-const std::string GDCM_NOTLOADED = "gdcm::NotLoaded";
-const std::string GDCM_UNREAD    = "gdcm::UnRead";
+const char GDCM_UNKNOWN[]   = "gdcm::Unknown";
+const char GDCM_UNFOUND[]   = "gdcm::Unfound";
+const char GDCM_BINLOADED[] = "gdcm::Binary data loaded";
+const char GDCM_NOTLOADED[] = "gdcm::NotLoaded";
+const char GDCM_UNREAD[]    = "gdcm::UnRead";
 
 //-----------------------------------------------------------------------------
 DictSet         *Global::Dicts   = (DictSet *)0;
@@ -78,6 +78,10 @@ Global::~Global()
    delete ValRes;
    delete TranSyn;
    delete ddElem;
+   Dicts = 0;
+   ValRes = 0;
+   TranSyn = 0;
+   ddElem = 0;
 }
 
 //-----------------------------------------------------------------------------
Index: Utilities/gdcm/src/gdcmUtil.cxx
===================================================================
RCS file: /cvsroot/Insight/Insight/Utilities/gdcm/src/gdcmUtil.cxx,v
retrieving revision 1.30
diff -u -3 -p -r1.30 gdcmUtil.cxx
--- Utilities/gdcm/src/gdcmUtil.cxx     9 Aug 2005 18:01:44 -0000       1.30
+++ Utilities/gdcm/src/gdcmUtil.cxx     12 Sep 2005 19:10:21 -0000
@@ -91,8 +91,8 @@
 namespace gdcm 
 {
 //-------------------------------------------------------------------------
-const std::string Util::GDCM_UID = "1.2.826.0.1.3680043.2.1143";
-std::string Util::RootUID        = GDCM_UID;
+const char GDCM_UID[] = "1.2.826.0.1.3680043.2.1143";
+static std::string RootUID = GDCM_UID; //static added by Stefan Klein
 
 //-------------------------------------------------------------------------
 // Public
Index: Utilities/gdcm/src/gdcmUtil.h
===================================================================
RCS file: /cvsroot/Insight/Insight/Utilities/gdcm/src/gdcmUtil.h,v
retrieving revision 1.6
diff -u -3 -p -r1.6 gdcmUtil.h
--- Utilities/gdcm/src/gdcmUtil.h       24 Feb 2005 19:01:10 -0000      1.6
+++ Utilities/gdcm/src/gdcmUtil.h       12 Sep 2005 19:10:21 -0000
@@ -67,8 +67,8 @@ public:
 private:
    static std::string GetIPAddress(); //Do not expose this method
 
-   static std::string RootUID;
-   static const std::string GDCM_UID;
+   //static std::string RootUID;
+   //static const std::string GDCM_UID;
 };
 
 GDCM_EXPORT std::ostream &binary_write(std::ostream &os, const uint16_t &val);