* gdcmPython/gdcm.i : remove useless lines concerning the gdcmGlobal

      gdcmGlob
    * gdcmPython/setup.py : replace the use of cvar.gdcmGlob to gdcmGlobal
    * src/gdcmUtil.h : export methods
    -- BeNours

diff --git a/ChangeLog b/ChangeLog
index 046870360d0b705353bc4e257f8c0791873991e2..edc45a8be027ed06a1e43271eb9d693368dde756 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-18 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+    * gdcmPython/gdcm.i : remove useless lines concerning the gdcmGlobal 
+      gdcmGlob
+    * gdcmPython/setup.py : replace the use of cvar.gdcmGlob to gdcmGlobal
+    * src/gdcmUtil.h : export methods
+
 2004-05-16  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
     * Some more cleanup/enhancement in gdcmPython/CMakeLists.txt getting close
       to right behavior

diff --git a/gdcmPython/__init__.py b/gdcmPython/__init__.py
index 8a73b05ba4637b4c804b0f0ca876d3e38343a54a..ced744ed51dfcb59d204311eaa3d96c4d6e92a9d 100644 (file)
--- a/gdcmPython/__init__.py
+++ b/gdcmPython/__init__.py
@@ -85,7 +85,7 @@ gdcmDicomDirSerie   = gdcm.gdcmDicomDirSerie
 gdcmDicomDirImage   = gdcm.gdcmDicomDirImage
 
 def GetPubDictEntryNames():
-   return gdcm.cvar.gdcmGlob.GetDicts().GetPubDictEntryNames()
+   return gdcmGlobal.GetDicts().GetPubDictEntryNames()
 
 def GetPubDictEntryNamesByCategory():
-   return gdcm.cvar.gdcmGlob.GetDicts().GetPubDictEntryNamesByCategory()
+   return gdcmGlobal.GetDicts().GetPubDictEntryNamesByCategory()

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index a5f9001599b4ce4e41567236dfaeec528f505a4b..a92fc741a2e6b7ada4f28c4aaa750ad5e89685f9 100644 (file)
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -67,12 +67,6 @@ void gdcmPythonVoidFuncArgDelete(void *arg)
 typedef  unsigned short guint16;
 typedef  unsigned int guint32;
 
-////////////////////////////////////////////////////////////////////////////
-// Global variables get exported to cvar in Python
-%immutable;
-extern gdcmGlobal gdcmGlob;
-%mutable;
-
 ////////////////////////////////////////////////////////////////////////////
 %typemap(out) std::list<std::string> * {
        PyObject* NewItem = (PyObject*)0;

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index b77fcb249740095ec16aa0355d568875fb43ef87..403397b7f419bd5ce24eb668b2eb15493508057b 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -6,6 +6,8 @@
 #include <vector>
 #include <string>
 
+#include "gdcmCommon.h"
+
 /**
  * \defgroup Globals Utility functions
  * \brief    Here are some utility functions, belonging to NO class,
@@ -14,15 +16,15 @@
  */
 
 //-----------------------------------------------------------------------------
-std::istream & eatwhite(std::istream & is);
+GDCM_EXPORT std::istream & eatwhite(std::istream & is);
 
-void Tokenize (const std::string& str,
+GDCM_EXPORT void Tokenize (const std::string& str,
                std::vector<std::string>& tokens,
                const std::string& delimiters = " ");
 
-std::string CreateCleanString(std::string s);
-void        NormalizePath(std::string &name);
-std::string GetPath(std::string &fullName);
-std::string GetName(std::string &fullName);
+GDCM_EXPORT std::string CreateCleanString(std::string s);
+GDCM_EXPORT void        NormalizePath(std::string &name);
+GDCM_EXPORT std::string GetPath(std::string &fullName);
+GDCM_EXPORT std::string GetName(std::string &fullName);
 //-----------------------------------------------------------------------------
 #endif