*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index c82d00861fa7b337e62728ca50661fe0800a8a69..a7f655fe5cb91240f0b5d39edf5b99febb5404c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,15 +16,17 @@
           be read when compressed or when HighBit + 1 != BitsStored),
         - gdcmPython/demo/vtkGdcmReader.py added. This demo illustrates
           the usage of the python wrapper of vtkGdcmReader vtk class.
-      * vtk/vtkGdcmReader.cxx: bug fixed (thanks to Benoit Regrain).  
+      * vtk/vtkGdcmReader.cxx: bug fixed (thanks to Benoit Regrain).
       * src/*.[h] all occurences of stl classes are now prefixed with
         std::, and all occurences of "using namespace std;" where removed.
         This is to avoid pollution of global namespace in included files.
         Apparently vtk does not avoid this pitfall: when using both
         gdcm and vtk (as in vtk/vtkGdcmReader.cxx) this ended up in a
         collision of various stl members (principally cout...).
-      * gdcmPython/testSuite.py now cleanly removes temprory generated 
+      * gdcmPython/testSuite.py now cleanly removes temprory generated
         file.
+      * gdcmPython/gdcm.i now declares a typemap for std::string (to
+         comply with above changes)
 
 2003-05-12  Eric Boix <Eric.Boix@creatis.insa-lyon.fr> with JPR
       * src/gdcmHeader>[h/cxx] added gdcmHeader::GetPixelSize()

diff --git a/gdcmPython/win32/_vtkGdcm.dsp b/gdcmPython/win32/_vtkGdcm.dsp
index 8e9b6f65a83372b0e8fbcc00deeb823c7a90e0af..806c6807701b53b0f5c65e66fd3e9ee2698dc642 100644 (file)
--- a/gdcmPython/win32/_vtkGdcm.dsp
+++ b/gdcmPython/win32/_vtkGdcm.dsp
@@ -40,9 +40,10 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "Release"\r
 # PROP Intermediate_Dir "Release"\r
+# PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_VTKGDCM_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_VTKGDCM_EXPORTS" /YX /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "..\..\vtk" /I "$(CREATIS)\python22\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_VTKGDCM_EXPORTS" /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40c /d "NDEBUG"\r
@@ -52,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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\r
+# 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:"..\vtkgdcmPython.dll"\r
 \r
 !ELSEIF  "$(CFG)" == "_vtkGdcm - Win32 Debug"\r
 \r
@@ -65,9 +66,10 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "Debug"\r
 # PROP Intermediate_Dir "Debug"\r
+# PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_VTKGDCM_EXPORTS" /YX /FD /GZ  /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_VTKGDCM_EXPORTS" /YX /FD /GZ  /c\r
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_VTKGDCM_EXPORTS" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "$(CREATIS)\python22\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_VTKGDCM_EXPORTS" /YX /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40c /d "_DEBUG"\r
@@ -77,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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 /debug /machine:I386 /pdbtype:sept\r
+# 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 /debug /machine:I386 /out:"..\vtkGdcmPython.dll" /pdbtype:sept\r
 \r
 !ENDIF \r
 \r
@@ -88,14 +90,168 @@ LINK32=link.exe
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmDict.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmDictEntry.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmDictSet.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmElValSet.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmElValue.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmException.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmFile.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmHeader.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmHeaderIdo.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmJpeg.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmUtil.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmVR.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\vtkGdcmInit.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\vtk\vtkGdcmReader.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\vtkGdcmReaderPython.cxx\r
+# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
+# Begin Source File\r
+\r
+SOURCE=.\init.h\r
+\r
+!IF  "$(CFG)" == "_vtkGdcm - Win32 Release"\r
+\r
+# Begin Custom Build - Performing Custom Build Step on $(VTKPATH)\bin\initwrappythonwin32 vtkgdcmPython vtkGdmReader > $(ProjDir)\vtkGdcmInit.cxx\r
+ProjDir=.\r
+InputPath=.\init.h\r
+\r
+"$(ProjDir)\vtkGdcmInit.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       $(VTKPATH)\bin\initwrappythonwin32 vtkgdcmPython vtkGdcmReader > $(ProjDir)\vtkGdcmInit.cxx\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "_vtkGdcm - Win32 Debug"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\vtk\vtkGdcmReader.h\r
+\r
+!IF  "$(CFG)" == "_vtkGdcm - Win32 Release"\r
+\r
+# Begin Custom Build - Performing Custom Build Step on $(VTKPATH)\bin\vtkwrappython "$(InputDir)\$(InputName).h" $(VTKPATH)\Examples\Build\vtkMy\Wrapping\hints 1  $(ProjDir)\..\$(InputName)Python.cxx\r
+InputDir=\Creatis\CVSimport\gdcm\vtk\r
+ProjDir=.\r
+InputPath=..\..\vtk\vtkGdcmReader.h\r
+InputName=vtkGdcmReader\r
+\r
+"$(ProjDir)\..\$(InputName)Python.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       $(VTKPATH)\bin\vtkwrappython "$(InputDir)\$(InputName).h" $(VTKPATH)\Examples\Build\vtkMy\Wrapping\hints 1  $(ProjDir)\..\$(InputName)Python.cxx\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "_vtkGdcm - Win32 Debug"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
 # End Group\r
 # Begin Group "Resource Files"\r
 \r
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\Python22\libs\python22.lib\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkRenderingPython.lib\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkCommonPython.lib\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkFiltering.lib\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkFilteringPython.lib\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkGraphics.lib\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkGraphicsPython.lib\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkImaging.lib\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkImagingPython.lib\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkRendering.lib\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkCommon.lib\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkIOPython.lib\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\vtkDistrib\lib\vtk\vtkIO.lib\r
+# End Source File\r
 # End Group\r
 # End Target\r
 # End Project\r

diff --git a/gdcmPython/win32/gdcmpyembedded.dsp b/gdcmPython/win32/gdcmpyembedded.dsp
index caa48e4cad3c2137ca92014860e4ddf28a8eefff..4fb066ed246ef57087bb71889f30a1fc2c7f6429 100644 (file)
--- a/gdcmPython/win32/gdcmpyembedded.dsp
+++ b/gdcmPython/win32/gdcmpyembedded.dsp
@@ -57,7 +57,7 @@ LINK32=link.exe
 # Begin Special Build Tool\r
 ProjDir=.\r
 SOURCE="$(InputPath)"\r
-PostBuild_Cmds=move        $(ProjDir)\gdcm.py        $(ProjDir)\..\ \r
+PostBuild_Cmds=move         $(ProjDir)\gdcm.py         $(ProjDir)\..\ \r
 # End Special Build Tool\r
 \r
 !ELSEIF  "$(CFG)" == "gdcmpyembedded - Win32 Debug"\r
@@ -74,7 +74,8 @@ PostBuild_Cmds=move        $(ProjDir)\gdcm.py        $(ProjDir)\..\
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYembedded_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /w /W0 /Gm /GX /ZI /Od /I "$(CREATIS)\python22\include" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYembedded_EXPORTS" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MTd /w /W0 /Gm /GX /ZI /I "$(CREATIS)\python22\include" /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYembedded_EXPORTS" /YX /FD /GZ /c\r
+# SUBTRACT CPP /O<none>\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40c /d "_DEBUG"\r
@@ -88,7 +89,7 @@ LINK32=link.exe
 # Begin Special Build Tool\r
 ProjDir=.\r
 SOURCE="$(InputPath)"\r
-PostBuild_Cmds=mv        $(ProjDir)\gdcm.py        $(ProjDir)\..\ \r
+PostBuild_Cmds=mv         $(ProjDir)\gdcm.py         $(ProjDir)\..\ \r
 # End Special Build Tool\r
 \r
 !ENDIF \r
@@ -112,7 +113,7 @@ InputPath=..\gdcm.i
 InputName=gdcm\r
 \r
 "$(ProjDir)\$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       C:\creatis\SWIG\swig -python -c++ -I..\..\..\src -o $(ProjDir)\$(InputName)_wrap.cxx $(InputPath)\r
+       C:\creatis\SWIG\swig -python -c++ -I..\..\src -o $(ProjDir)\$(InputName)_wrap.cxx $(InputPath)\r
 \r
 # End Custom Build\r
 \r