* vtk/testvtkGdcmReader.cxx : remove a symbol that is unused

      * src/jpeg/libijg8/jmorecfg.h : adding export symbol for windows
      * *.dsp : modifications to use new libgdcmijpeg8 library
      * setup.py : bug fix on VTKPATH variable
      * PACKAGER : adding all concerning windows
      -- BeNours

diff --git a/ChangeLog b/ChangeLog
index 9e190088a86140395cb3571c70c4ab21e2e5b072..150c67cd2d2f6a9b0c7c4d9f9fbdf8e1bf1af6b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
+2003-07-08  Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+      * vtk/testvtkGdcmReader.cxx : remove a symbol that is unused
+      * src/jpeg/libijg8/jmorecfg.h : adding export symbol for windows
+      * *.dsp : modifications to use new libgdcmijpeg8 library
+      * setup.py : bug fix on VTKPATH variable
+      * PACKAGER : adding all concerning windows
+
 2003-07-07  Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
       * src/gdcmElValSet.cxx, gdcmFile.cxx: JPR bug fix, removal of
         garbage debug code.
       * TODO, vtk/vtkGdcmReader.cxx: upcoming fixes comments.
-      * gdcmPython/testSuite.py: JPR bug fix, brutal erasement of 
+      * gdcmPython/testSuite.py: JPR bug fix, brutal erasement of
         test suite reported error.
       * PACKAGER file added (describes what a packager must do when
         packaging a new release).

diff --git a/PACKAGER b/PACKAGER
index 1d2657a0993e9f956e3f1adb9d41eee3f7c2c82b..55e3345adb857266930f316fbba4766ce451cf2e 100644 (file)
--- a/PACKAGER
+++ b/PACKAGER
@@ -45,13 +45,58 @@ Here is the checklist when freezing a version of gdcm:
          cd $(GDCMHOME)
          python setup.py sdist
          cd /tmp
-         tar zxvf ~/cvs/gdcm/dist/gdcmPython-*.tar.gz
+         tar zxvf $(GDCMHOME)/dist/gdcmPython-*.tar.gz
          cd gdcmPython-*/
          python setup.py bdist --formats=rpm
          As root, repeat above installation with rpm and test.
          
   2/ Windoze:
+    Notation: we consider that GDCMHOME is the directory obtained from the
+    following checkout.
+    cvs -d:pserver:anonymous@cvs.creatis.insa-lyon.fr:2402/cvs/public login
+    cvs -d:pserver:anonymous@cvs.creatis.insa-lyon.fr:2402/cvs/public co gdcm
+    cd gdcm
+    cvs -d:pserver:anonymous@cvs.creatis.insa-lyon.fr:2402/cvs/public co gdcmData
 
+    2a/ compile all projects in the gdcm.dsw workspace.
+
+    2b/ set the PYTHONPATH environement variable to the gdcm/gdcmPython
+       directory
+       check the python test suite is clean (python testSuite.py)
+       cd gdcmPython
+       python testSuite.py
+
+    2c/ check the setup.py distutil script is operational and then validate
+        its produced packages through the test suite, in all following cases
+       - Direct installation:
+         cd $(GDCMHOME)
+         python setup.py install --prefix="c:\tmp"
+         cd /tmp/Lib/site-packages/
+         copy $(GDCMDATAHOME) .
+         export PYTHONPATH="c:\tmp\Lib\site-packages"
+         cd gdcmPython/
+         python testSuite.py
+         remove $(GDCMHOME)\build directory
+       - Binary distribution:
+         cd $(GDCMHOME)
+         python setup.py bdist --formats=wininst
+         install $(GDCMHOME)\dist\gdcmPython-0.3.win32-py2.2.exe
+         cd $(PYTHONHOME)\Lib\site-packages\
+         Check out gdcmData
+         cd gdcmPython
+         clean up PYTHONPATH
+         python testSuite.py
+         remove $(GDCMHOME)\build directory
+       - Source distribution and then binary distribution (out of build
+         source distro):
+         cd $(GDCMHOME)
+         python setup.py sdist --formats=zip
+         unzip $(GDCMHOME)\dist\gdcmPython-0.3.zip in TMPHOME directory
+         cd $(TMPHOME)
+         cd gdcmPython-*/
+         python setup.py bdist --formats=wininst
+         As root, repeat above installation with exe and test.
+         
 * Second stage: preparing packaging:
   - Update the version number in configure.in (AM_INIT_AUTOMAKE)
   - Update the version number in setup.py (version entry in setup object).
@@ -73,3 +118,11 @@ Here is the checklist when freezing a version of gdcm:
          python setup.py sdist
          python setup.py bdist --formats=rpm
          collect both source distro and binary distro
+
+  2/ Un*x
+    2a/ Packaging at the python level:
+         cd $(GDCMHOME)
+         python setup.py sdist --formats=zip
+         python setup.py bdist --formats=wininst
+         collect both source distro and binary distro
+

diff --git a/gdcm.dsw b/gdcm.dsw
index 7771a996da366d5d06ad6964e60f05ecbbde279c..be905f70e6c0a8bee1886c6defb381db6ab323e9 100644 (file)
--- a/gdcm.dsw
+++ b/gdcm.dsw
@@ -11,6 +11,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name libgdcmijpeg8
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -23,6 +26,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name libgdcmijpeg8
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -35,6 +41,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name libgdcmijpeg8
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -45,6 +54,21 @@ Package=<5>
 {{{
 }}}
 
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name gdcmdll
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "libgdcmijpeg8"=.\SRC\WIN32\libgdcmijpeg8.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
 Package=<4>
 {{{
 }}}
@@ -59,6 +83,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name vtkgdcm
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -71,6 +98,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name libgdcmijpeg8
+    End Project Dependency
 }}}
 
 ###############################################################################

diff --git a/gdcmPython/win32/_vtkGdcm.dsp b/gdcmPython/win32/_vtkGdcm.dsp
index ea098265c6ef56403914464562327af5a821a712..4169f21d9b1739f755135935ada54b95a8172247 100644 (file)
--- a/gdcmPython/win32/_vtkGdcm.dsp
+++ b/gdcmPython/win32/_vtkGdcm.dsp
@@ -148,190 +148,6 @@ SOURCE=..\..\src\gdcmVR.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\jpeg\libijg8\jcapimin.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcapistd.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jccoefct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jccolor.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcdctmgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jchuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcinit.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcmainct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcmarker.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcmaster.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcomapi.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcparam.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcphuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcprepct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcsample.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jctrans.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdapimin.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdapistd.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdatadst.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdatasrc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdcoefct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdcolor.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jddctmgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdhuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdinput.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdmainct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdmarker.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdmaster.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdmerge.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdphuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdpostct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdsample.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdtrans.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jerror.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jfdctflt.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jfdctfst.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jfdctint.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jidctflt.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jidctfst.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jidctint.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jidctred.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jmemmgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jmemnobs.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jquant1.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jquant2.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jutils.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\vtkGdcmInit.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -421,5 +237,9 @@ SOURCE=C:\Creatis\vtkDistrib\lib\vtk\vtkFilteringPython.lib
 SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkFiltering.lib\r
 # End Source File\r
 # End Group\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\libgdcmijpeg8.lib\r
+# End Source File\r
 # End Target\r
 # End Project\r

diff --git a/gdcmPython/win32/gdcmpyembedded.dsp b/gdcmPython/win32/gdcmpyembedded.dsp
index 632798ab1179fb318b72c2edf9c840423a68d850..17cbfff7eb439a2fc981142f5adeea34c3c011f2 100644 (file)
--- a/gdcmPython/win32/gdcmpyembedded.dsp
+++ b/gdcmPython/win32/gdcmpyembedded.dsp
@@ -53,11 +53,11 @@ 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 advapi32.lib shell32.lib Wsock32.lib /nologo /dll /machine:I386 /out:"../_gdcm.dll"\r
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib Wsock32.lib /nologo /dll /machine:I386 /out:"..\_gdcm.dll"\r
 # 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
@@ -84,11 +84,11 @@ 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 advapi32.lib shell32.lib Wsock32.lib /nologo /dll /debug /machine:I386 /out:"../_gdcm_d.dll" /pdbtype:sept\r
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib Wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\_gdcm_d.dll" /pdbtype:sept\r
 # 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
@@ -191,190 +191,6 @@ SOURCE=..\..\src\gdcmUtil.cxx
 \r
 SOURCE=..\..\src\gdcmVR.cxx\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcapimin.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcapistd.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jccoefct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jccolor.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcdctmgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jchuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcinit.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcmainct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcmarker.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcmaster.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcomapi.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcparam.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcphuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcprepct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcsample.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jctrans.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdapimin.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdapistd.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdatadst.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdatasrc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdcoefct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdcolor.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jddctmgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdhuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdinput.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdmainct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdmarker.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdmaster.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdmerge.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdphuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdpostct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdsample.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdtrans.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jerror.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jfdctflt.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jfdctfst.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jfdctint.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jidctflt.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jidctfst.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jidctint.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jidctred.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jmemmgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jmemnobs.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jquant1.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jquant2.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jutils.c\r
-# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r
@@ -388,5 +204,9 @@ SOURCE=..\..\src\jpeg\libijg8\jutils.c
 SOURCE=c:\Creatis\Python22\libs\python22.lib\r
 # End Source File\r
 # End Group\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\libgdcmijpeg8.lib\r
+# End Source File\r
 # End Target\r
 # End Project\r

diff --git a/setup.py b/setup.py
index 6d8eee5da927f5c124a231fca0cf2aca0d2fcf27..54d85df2e4627d48896d87efbf641c4d09550d3a 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ if(os.name=='posix'):
        libraries=["stdc++"]
        macros   =[('__STDC_LIMIT_MACROS', '1')]
 
-       VTK_PATH="/usr"
+       VTKPATH="/usr"
        vtkWrapper="vtkWrapPython"
 else:
        targetDir=os.path.join('lib','site-packages')
@@ -27,13 +27,13 @@ else:
        macros   =[]
 
        try:
-               VTK_PATH=os.environ['VTK_PATH']
+               VTKPATH=os.environ['VTKPATH']
        except KeyError,e:
                err=str(e)
                print "Environment variable",err[err.rfind(':')+1:],'not defined, '\
                       'please fix it!'
-               VTK_PATH="c:\\Creatis\\vtkDistrib"
-       vtkWrapper=os.path.join(VTK_PATH,"bin","vtkWrapPython")
+               VTKPATH="c:\\Creatis\\vtkDistrib"
+       vtkWrapper=os.path.join(VTKPATH,"bin","vtkWrapPython")
 
 targetDir=os.path.join(targetDir, ThisModule)
 
@@ -60,8 +60,8 @@ Sources.extend(Jpeg8Sources)
 
 # Sources 2/ The second extension contains the VTK classes (which we wrap
 #            with the vtk wrappers):
-VTK_INCLUDE_DIR=os.path.join(VTK_PATH,"include","vtk")
-VTK_LIB_DIR=os.path.join(VTK_PATH,"lib","vtk")
+VTK_INCLUDE_DIR=os.path.join(VTKPATH,"include","vtk")
+VTK_LIB_DIR=os.path.join(VTKPATH,"lib","vtk")
 vtkSources = []
 vtkSources.extend(glob.glob(os.path.join(gdcmvtkSrcDir,"vtk*.cxx")))
 vtkSources.extend(glob.glob(os.path.join(gdcmSrcDir,"*.cxx")))

diff --git a/src/jpeg/libijg/jmorecfg.h b/src/jpeg/libijg/jmorecfg.h
index a590351dd44b2ed65f720352d5c950e5a8e02faf..d10fb8f1d080c6b3414a0eaff1f942f28fe88301 100644 (file)
--- a/src/jpeg/libijg/jmorecfg.h
+++ b/src/jpeg/libijg/jmorecfg.h
@@ -185,9 +185,17 @@ typedef unsigned int JDIMENSION;
 /* a function used only in its module: */
 #define LOCAL(type)            static type
 /* a function referenced thru EXTERNs: */
-#define GLOBAL(type)           type
+#ifdef WIN32
+  #define GLOBAL(type)         __declspec( dllexport ) type
+#else
+  #define GLOBAL(type)         type
+#endif
 /* a reference to a GLOBAL function: */
-#define EXTERN(type)           extern type
+#ifdef WIN32
+  #define EXTERN(type)         extern __declspec( dllexport ) type
+#else
+  #define EXTERN(type)         extern type
+#endif
 
 
 /* This macro is used to declare a "method", that is, a function pointer.

diff --git a/src/jpeg/libijg8/jmorecfg.h b/src/jpeg/libijg8/jmorecfg.h
index a590351dd44b2ed65f720352d5c950e5a8e02faf..d10fb8f1d080c6b3414a0eaff1f942f28fe88301 100644 (file)
--- a/src/jpeg/libijg8/jmorecfg.h
+++ b/src/jpeg/libijg8/jmorecfg.h
@@ -185,9 +185,17 @@ typedef unsigned int JDIMENSION;
 /* a function used only in its module: */
 #define LOCAL(type)            static type
 /* a function referenced thru EXTERNs: */
-#define GLOBAL(type)           type
+#ifdef WIN32
+  #define GLOBAL(type)         __declspec( dllexport ) type
+#else
+  #define GLOBAL(type)         type
+#endif
 /* a reference to a GLOBAL function: */
-#define EXTERN(type)           extern type
+#ifdef WIN32
+  #define EXTERN(type)         extern __declspec( dllexport ) type
+#else
+  #define EXTERN(type)         extern type
+#endif
 
 
 /* This macro is used to declare a "method", that is, a function pointer.

diff --git a/src/win32/gdcmdll.dsp b/src/win32/gdcmdll.dsp
index b33fa499bbabc3f627e03d092634c7d6b8205486..7d0a42ab0774567eeacd9b39c9d63dc8c0a7c9a9 100644 (file)
--- a/src/win32/gdcmdll.dsp
+++ b/src/win32/gdcmdll.dsp
@@ -53,12 +53,12 @@ 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 Wsock32.lib /nologo /dll /machine:I386 /out:"../../../lib/gdcmdll.dll"\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:"../../lib/gdcmdll.dll"\r
 # SUBTRACT LINK32 /debug\r
 # Begin Special Build Tool\r
 SOURCE="$(InputPath)"\r
 PostBuild_Desc=Copy for test\r
-PostBuild_Cmds=copy       ..\..\lib\gdcmdll.dll       ..\..\gdcmPython\        copy       ..\..\lib\gdcmdll.dll       ..\..\test\      copy    Release\gdcmdll.lib    ..\..\lib\ \r
+PostBuild_Cmds=copy        ..\..\lib\gdcmdll.dll        ..\..\gdcmPython\      copy        ..\..\lib\gdcmdll.dll        ..\..\test\            copy     Release\gdcmdll.lib     ..\..\lib\ \r
 # End Special Build Tool\r
 \r
 !ELSEIF  "$(CFG)" == "gdcmdll - Win32 Debug"\r
@@ -85,12 +85,12 @@ 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 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:"../../lib/gdcmdll.dll" /pdbtype:sept\r
+# 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:"..\..\lib\gdcmdll.dll" /pdbtype:sept\r
 # SUBTRACT LINK32 /incremental:no\r
 # Begin Special Build Tool\r
 SOURCE="$(InputPath)"\r
 PostBuild_Desc=Copy for test\r
-PostBuild_Cmds=copy       ..\..\lib\gdcmdll.dll       ..\..\gdcmPython\        copy       ..\..\lib\gdcmdll.dll       ..\..\test\      copy    Debug\gdcmdll.lib    ..\..\lib\ \r
+PostBuild_Cmds=copy        ..\..\lib\gdcmdll.dll        ..\..\gdcmPython\      copy        ..\..\lib\gdcmdll.dll        ..\..\test\            copy     Debug\gdcmdll.lib     ..\..\lib\ \r
 # End Special Build Tool\r
 \r
 !ENDIF \r
@@ -158,190 +158,6 @@ SOURCE=..\gdcmUtil.cxx
 \r
 SOURCE=..\gdcmVR.cxx\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jcapimin.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jcapistd.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jccoefct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jccolor.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jcdctmgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jchuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jcinit.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jcmainct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jcmarker.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jcmaster.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jcomapi.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jcparam.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jcphuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jcprepct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jcsample.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jctrans.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdapimin.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdapistd.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdatadst.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdatasrc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdcoefct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdcolor.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jddctmgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdhuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdinput.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdmainct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdmarker.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdmaster.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdmerge.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdphuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdpostct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdsample.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jdtrans.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jerror.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jfdctflt.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jfdctfst.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jfdctint.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jidctflt.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jidctfst.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jidctint.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jidctred.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jmemmgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jmemnobs.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jquant1.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jquant2.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\jpeg\libijg8\jutils.c\r
-# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r
@@ -353,7 +169,7 @@ SOURCE=..\jpeg\libijg8\jutils.c
 # End Group\r
 # Begin Source File\r
 \r
-SOURCE=..\jp\r
+SOURCE=..\..\lib\libgdcmijpeg8.lib\r
 # End Source File\r
 # End Target\r
 # End Project\r

diff --git a/src/win32/libgdcmijpeg8.dsp b/src/win32/libgdcmijpeg8.dsp
new file mode 100644 (file)
index 0000000..5e30cdc
--- /dev/null
+++ b/src/win32/libgdcmijpeg8.dsp
@@ -0,0 +1,295 @@
+# Microsoft Developer Studio Project File - Name="libgdcmijpeg8" - Package Owner=<4>\r
+# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
+# ** DO NOT EDIT **\r
+\r
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
+\r
+CFG=libgdcmijpeg8 - Win32 Debug\r
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
+!MESSAGE use the Export Makefile command and run\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "libgdcmijpeg8.mak".\r
+!MESSAGE \r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "libgdcmijpeg8.mak" CFG="libgdcmijpeg8 - Win32 Debug"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "libgdcmijpeg8 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "libgdcmijpeg8 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE \r
+\r
+# Begin Project\r
+# PROP AllowPerConfigDependencies 0\r
+# PROP Scc_ProjName ""\r
+# PROP Scc_LocalPath ""\r
+CPP=cl.exe\r
+MTL=midl.exe\r
+RSC=rc.exe\r
+\r
+!IF  "$(CFG)" == "libgdcmijpeg8 - Win32 Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "Release"\r
+# PROP BASE Intermediate_Dir "Release"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "Release__libgdcmijpeg8"\r
+# PROP Intermediate_Dir "Release__libgdcmijpeg8"\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 "LIBGDCMIJPEG8_EXPORTS" /YX /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMIJPEG8_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
+# ADD RSC /l 0x40c /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# 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 /out:"..\..\lib\libgdcmijpeg8.dll"\r
+# Begin Special Build Tool\r
+SOURCE="$(InputPath)"\r
+PostBuild_Cmds=copy  Release__libgdcmijpeg8\libgdcmijpeg8.lib  ..\..\lib\      copy  ..\..\lib\libgdcmijpeg8.dll  ..\..\gdcmPython\    copy  ..\..\lib\libgdcmijpeg8.dll  ..\..\vtk\ \r
+# End Special Build Tool\r
+\r
+!ELSEIF  "$(CFG)" == "libgdcmijpeg8 - Win32 Debug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "Debug"\r
+# PROP BASE Intermediate_Dir "Debug"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "Debug__libgdcmijpeg8"\r
+# PROP Intermediate_Dir "Debug__libgdcmijpeg8"\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 "LIBGDCMIJPEG8_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 "LIBGDCMIJPEG8_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
+# ADD RSC /l 0x40c /d "_DEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# 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 /out:"..\..\lib\libgdcmijpeg8.dll" /pdbtype:sept\r
+# Begin Special Build Tool\r
+SOURCE="$(InputPath)"\r
+PostBuild_Cmds=copy  Debug__libgdcmijpeg8\libgdcmijpeg8.lib  ..\..\lib\        copy  ..\..\lib\libgdcmijpeg8.dll  ..\..\gdcmPython\    copy  ..\..\lib\libgdcmijpeg8.dll  ..\..\vtk\ \r
+# End Special Build Tool\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "libgdcmijpeg8 - Win32 Release"\r
+# Name "libgdcmijpeg8 - Win32 Debug"\r
+# 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=..\jpeg\libijg8\jcapimin.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcapistd.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jccoefct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jccolor.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcdctmgr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jchuff.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcinit.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcmainct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcmarker.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcmaster.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcomapi.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcparam.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcphuff.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcprepct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jcsample.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jctrans.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdapimin.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdapistd.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdatadst.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdatasrc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdcoefct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdcolor.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jddctmgr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdhuff.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdinput.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdmainct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdmarker.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdmaster.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdmerge.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdphuff.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdpostct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdsample.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jdtrans.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jerror.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jfdctflt.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jfdctfst.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jfdctint.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jidctflt.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jidctfst.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jidctint.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jidctred.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jmemmgr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jmemnobs.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jquant1.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jquant2.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg8\jutils.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files"\r
+\r
+# PROP Default_Filter "h;hpp;hxx;hm;inl"\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
+# End Group\r
+# End Target\r
+# End Project\r

diff --git a/vtk/testvtkGdcmReader.cxx b/vtk/testvtkGdcmReader.cxx
index 6208088342f727571a14fdcf16f2125b3a96da1b..6dbbff7db9c11dba499889127ba9123def136cdd 100644 (file)
--- a/vtk/testvtkGdcmReader.cxx
+++ b/vtk/testvtkGdcmReader.cxx
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/vtk/Attic/testvtkGdcmReader.cxx,v 1.4 2003/05/21 16:26:29 regrain Exp $
+// $Header: /cvs/public/gdcm/vtk/Attic/testvtkGdcmReader.cxx,v 1.5 2003/07/08 09:48:43 regrain Exp $
 
 #include <vtkRenderer.h>
 #include <vtkRenderWindow.h>
@@ -25,7 +25,6 @@
   
 int main( int argc, char *argv[] )
 {
-   char a;
    int *taille;
    int x,y;
 

diff --git a/vtk/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp
index fc904fbc4761a3e931f07aaa7b2c824d9667b917..92a7f89e2000aa24fd38864ea308ccd613f0c212 100644 (file)
--- a/vtk/win32/vtkgdcm.dsp
+++ b/vtk/win32/vtkgdcm.dsp
@@ -53,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 Wsock32.lib /nologo /dll /machine:I386 /out:"..\..\lib\vtkgdcm.dll" /libpath:"$(VTKPATH)\lib\vtk ../../../lib/"\r
+# ADD LINK32 Wsock32.lib /nologo /dll /machine:I386 /out:"..\..\lib\vtkgdcm.dll" /libpath:"$(VTKPATH)\lib\vtk ../../lib/"\r
 # Begin Special Build Tool\r
 SOURCE="$(InputPath)"\r
 PostBuild_Cmds=copy ..\..\lib\vtkgdcm.dll ..\  copy Release\vtkgdcm.lib ..\..\lib\vtkgdcm.lib\r
@@ -83,7 +83,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 Wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\lib\vtkgdcm.dll" /pdbtype:sept /libpath:"$(VTKPATH)\lib\vtk ../../../lib/"\r
+# ADD LINK32 Wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\lib\vtkgdcm.dll" /pdbtype:sept /libpath:"$(VTKPATH)\lib\vtk ../../lib/"\r
 # Begin Special Build Tool\r
 SOURCE="$(InputPath)"\r
 PostBuild_Cmds=copy ..\..\lib\vtkgdcm.dll ..\  copy Debug\vtkgdcm.lib ..\..\lib\vtkgdcm.lib\r
@@ -156,190 +156,6 @@ SOURCE=..\..\src\gdcmVR.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\jpeg\libijg8\jcapimin.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcapistd.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jccoefct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jccolor.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcdctmgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jchuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcinit.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcmainct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcmarker.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcmaster.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcomapi.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcparam.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcphuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcprepct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jcsample.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jctrans.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdapimin.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdapistd.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdatadst.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdatasrc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdcoefct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdcolor.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jddctmgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdhuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdinput.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdmainct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdmarker.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdmaster.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdmerge.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdphuff.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdpostct.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdsample.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jdtrans.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jerror.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jfdctflt.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jfdctfst.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jfdctint.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jidctflt.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jidctfst.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jidctint.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jidctred.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jmemmgr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jmemnobs.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jquant1.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jquant2.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\jpeg\libijg8\jutils.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\vtkGdcmReader.cxx\r
 # End Source File\r
 # End Group\r
@@ -363,5 +179,9 @@ SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkCommon.lib
 SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkFiltering.lib\r
 # End Source File\r
 # End Group\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\libgdcmijpeg8.lib\r
+# End Source File\r
 # End Target\r
 # End Project\r