2002-12-6 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>

      * wrapping python correct with standalone wrapped dll (don't use separate
         dll under windows !!!!)
      * removed glib references
      * typedef's inserted in gdcm.i for correct swig type management
      * python21_d MODE DEBUG enabled (ask Frog how to use it)
      * NO problem with having an STL member of class for example string in C++
      * PYTHON TEST OF DCMLIB OK UNDER WINDOWS ON A LARGE SET (one) of IMAGE(s).

diff --git a/ChangeLog b/ChangeLog
index ad6e4a18be55982c746e320bdc823402d9c78dbc..8a7df0447babb9ec278c212085f5e90079b5e8df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-6 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
+      * wrapping python correct with standalone wrapped dll (don't use separate
+         dll under windows !!!!)
+      * removed glib references
+      * typedef's inserted in gdcm.i for correct swig type management
+      * python21_d MODE DEBUG enabled (ask Frog how to use it)
+      * NO problem with having an STL member of class for example string in C++
+      * PYTHON TEST OF DCMLIB OK UNDER WINDOWS ON A LARGE SET (one) of IMAGE(s).
+
 2002-11-27 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
       * python/demo/*.py load.py extracted from test.py. Added explore.py
         that only displays required tags and testAll.py that parses all

diff --git a/gdcm.dsw b/gdcm.dsw
index 8d40f1e0448cfebf1a9cc39255d3c09cd88fa75d..71bfbb5df77591f2f19e2b63d18838f35e65c900 100644 (file)
--- a/gdcm.dsw
+++ b/gdcm.dsw
@@ -27,6 +27,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "gdcmpycomplet"=".\python\gdcmpy\gdcmpycomplet.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "gdcmtest"=".\TEST\WIN32\gdcmtest\gdcmtest.dsp" - Package Owner=<4>
 
 Package=<5>

diff --git a/src/gdcm.h b/src/gdcm.h
index c5ae0c6f0534fdc0b27439404ed331607990b238..3b35c7629547c70a4e09e148e47e3138c052e399 100644 (file)
--- a/src/gdcm.h
+++ b/src/gdcm.h
@@ -28,15 +28,19 @@
                       // 3/ Make sure we can setup some default size value,
                       //    which should be around 4500 entries which is the
                       //    average dictionary size (said JPR)
+
+#define g_malloc malloc
+#define g_free   free
+
 #ifdef __GNUC__
 #include <stdint.h>
 #define guint16 uint16_t
 #define guint32 uint32_t
-#define g_malloc malloc
-#define g_free   free
 #endif
-#ifdef _MSC_VER
-#include <glib.h>
+#ifdef _MSC_VER 
+typedef  unsigned short guint16;
+typedef  unsigned int guint32;
+
 #endif
 
 #ifdef _MSC_VER

diff --git a/src/win32/gdcmdll/gdcmdll.dsp b/src/win32/gdcmdll/gdcmdll.dsp
index bf39ec903aaba49a40d8d335c9f5615d3796d292..5f0b44466134df75b09224a88343886d70da177b 100644 (file)
--- a/src/win32/gdcmdll/gdcmdll.dsp
+++ b/src/win32/gdcmdll/gdcmdll.dsp
@@ -40,9 +40,10 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "C:\creatis\glib-1.3\src\glib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /w /W0 /GX /O2 /I "C:\creatis\glib-1.3\src\glib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40c /d "NDEBUG"
@@ -52,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib /nologo /dll /machine:I386 /out:"../../../python/gdcmdll.dll"
 
 !ELSEIF  "$(CFG)" == "gdcmdll - Win32 Debug"
 
@@ -67,8 +68,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MTd /w /W0 /Gm /GX /ZI /Od /I "C:\creatis\glib-1.3\src\glib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /GZ  /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /ML /w /W0 /Gm /GX /ZI /Od /I "C:\creatis\glib-1.3\src\glib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40c /d "_DEBUG"
@@ -78,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 Wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"../../../python/gdcmdll.dll" /pdbtype:sept
 
 !ENDIF