2003-07-03 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>

      * setup.py : adding include dir of jpeg lib to compile all sources
      * */Win32/*.dsp : JPR fix for windows compilation
      -- BeNours

diff --git a/ChangeLog b/ChangeLog
index 3b4b930add720daf8343d166752298725ab11d72..58713f3d00df8abd361a96942213d51c3409c4b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-03  Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+      * setup.py : adding include dir of jpeg lib to compile all sources
+      * */Win32/*.dsp : JPR fix for windows compilation
+
 2003-07-02  Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
       * src/jpeg/libijg8/jconfig.* : JPR bug fix : now compile on both
         linux and WINDOWS !

diff --git a/gdcmPython/win32/_vtkGdcm.dsp b/gdcmPython/win32/_vtkGdcm.dsp
index f00d361aae39bdfe3dcbfb4f0ef75763edd87b7b..ea098265c6ef56403914464562327af5a821a712 100644 (file)
--- a/gdcmPython/win32/_vtkGdcm.dsp
+++ b/gdcmPython/win32/_vtkGdcm.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # 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 /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 CPP /nologo /MT /W3 /GX /O2 /I "..\..\src\jpeg\libijg8" /I "..\..\vtk" /I "$(VTKPATH)\include\vtk" /I "..\..\src" /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
@@ -69,7 +69,7 @@ LINK32=link.exe
 # 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 /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "..\\" /I "$(CREATIS)\python22\include" /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 "..\\" /I "$(VTKPATH)\include\vtk" /I "..\..\src" /I "..\..\src\jpeg\libijg8" /I "..\..\vtk" /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
@@ -132,6 +132,14 @@ SOURCE=..\..\src\gdcmJpeg.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\gdcmJpegIdo.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmTS.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\gdcmUtil.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -140,6 +148,190 @@ 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

diff --git a/gdcmPython/win32/gdcmpyembedded.dsp b/gdcmPython/win32/gdcmpyembedded.dsp
index e389910bcb7da7baf841a3be94b46045f95edbe7..632798ab1179fb318b72c2edf9c840423a68d850 100644 (file)
--- a/gdcmPython/win32/gdcmpyembedded.dsp
+++ b/gdcmPython/win32/gdcmpyembedded.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # 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 "GDCMPYembedded_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MT /w /W0 /GX /O2 /I "$(CREATIS)\python22\include" /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYembedded_EXPORTS" /YX /FD /c\r
+# ADD CPP /nologo /MT /w /W0 /GX /O2 /I "$(CREATIS)\python22\include" /I "..\..\src" /I "..\..\src\jpeg\libijg8" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMPYembedded_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
@@ -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,7 @@ 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 /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 "..\..\src\jpeg\libijg8" /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 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 +88,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
@@ -177,12 +177,204 @@ SOURCE=..\..\src\gdcmJpeg.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\gdcmJpegIdo.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmTS.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=..\..\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

diff --git a/setup.py b/setup.py
index 3d7040f065432875561b14240f92c065d06c2859..6d8eee5da927f5c124a231fca0cf2aca0d2fcf27 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -65,13 +65,14 @@ VTK_LIB_DIR=os.path.join(VTK_PATH,"lib","vtk")
 vtkSources = []
 vtkSources.extend(glob.glob(os.path.join(gdcmvtkSrcDir,"vtk*.cxx")))
 vtkSources.extend(glob.glob(os.path.join(gdcmSrcDir,"*.cxx")))
+vtkSources.extend(Jpeg8Sources)
 vtkLibraries=["vtkCommon","vtkCommonPython",
               "vtkIO","vtkIOPython",
               "vtkFiltering","vtkFilteringPython"]
 
 ##### 
 setup(name=ThisModule,
-      version="0.2",
+      version="0.3",
       description="...",
       author="frog",
       author_email="frog@creatis.insa-lyon.fr",
@@ -82,7 +83,7 @@ setup(name=ThisModule,
       cmdclass={'build_ext':build_extWrap}, # redirects default build_ext
       ext_modules=[SwigExtension(name='_gdcm',
                                  sources=Sources,
-                                 include_dirs=[gdcmSrcDir],
+                                 include_dirs=[gdcmSrcDir,gdcmJpeg8SrcDir],
                                  libraries=libraries,
                                  define_macros=macros,
                                  swig_cpp=1,

diff --git a/vtk/win32/vtkGdcmTest.dsp b/vtk/win32/vtkGdcmTest.dsp
index d7db2a067315cdfcb0c76715dd70a72346bc19ff..6c8d8cadb81ccfe17031335820f5131d00418e22 100644 (file)
--- a/vtk/win32/vtkGdcmTest.dsp
+++ b/vtk/win32/vtkGdcmTest.dsp
@@ -74,7 +74,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 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 /subsystem:console /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 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 /subsystem:console /debug /machine:I386 /out:"..\vtkGdcmTest.exe" /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 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 /subsystem:console /debug /machine:I386 /out:"..\vtkGdcmTest.exe" /pdbtype:sept\r
 \r
 !ENDIF \r
 \r

diff --git a/vtk/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp
index ce44e53b465e7b69480589ed28c5a5f9f53ae372..fc904fbc4761a3e931f07aaa7b2c824d9667b917 100644 (file)
--- a/vtk/win32/vtkgdcm.dsp
+++ b/vtk/win32/vtkgdcm.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # 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 /I "$(VTKPATH)\include\vtk" /I "..\..\src" /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 "..\..\src\jpeg\libijg8" /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
@@ -73,7 +73,7 @@ PostBuild_Cmds=copy ..\..\lib\vtkgdcm.dll ..\ copy Release\vtkgdcm.lib ..\..\lib
 # 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 /I "$(VTKPATH)\include\vtk" /I "..\..\src" /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 "..\..\src\jpeg\libijg8" /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
@@ -140,6 +140,14 @@ SOURCE=..\..\src\gdcmJpeg.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\gdcmJpegIdo.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmTS.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\gdcmUtil.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -148,6 +156,190 @@ 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