From: regrain Date: Thu, 3 Jul 2003 16:09:51 +0000 (+0000) Subject: 2003-07-03 Benoit Regrain X-Git-Tag: Version0.3~10 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2f61d414feccac86c4ea1a6ccda4d1fac9dba37e;p=gdcm.git 2003-07-03 Benoit Regrain * 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 3b4b930a..58713f3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-07-03 Benoit Regrain + * setup.py : adding include dir of jpeg lib to compile all sources + * */Win32/*.dsp : JPR fix for windows compilation + 2003-07-02 Benoit Regrain * 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 f00d361a..ea098265 100644 --- a/gdcmPython/win32/_vtkGdcm.dsp +++ b/gdcmPython/win32/_vtkGdcm.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # 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 "_VTKGDCM_EXPORTS" /YX /FD /c -# 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 +# 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 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40c /d "NDEBUG" @@ -69,7 +69,7 @@ LINK32=link.exe # 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 "_VTKGDCM_EXPORTS" /YX /FD /GZ /c -# 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 +# 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 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40c /d "_DEBUG" @@ -132,6 +132,14 @@ SOURCE=..\..\src\gdcmJpeg.cxx # End Source File # Begin Source File +SOURCE=..\..\src\gdcmJpegIdo.cxx +# End Source File +# Begin Source File + +SOURCE=..\..\src\gdcmTS.cxx +# End Source File +# Begin Source File + SOURCE=..\..\src\gdcmUtil.cxx # End Source File # Begin Source File @@ -140,6 +148,190 @@ SOURCE=..\..\src\gdcmVR.cxx # End Source File # Begin Source File +SOURCE=..\..\src\jpeg\libijg8\jcapimin.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcapistd.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jccoefct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jccolor.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcdctmgr.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jchuff.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcinit.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcmainct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcmarker.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcmaster.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcomapi.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcparam.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcphuff.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcprepct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcsample.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jctrans.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdapimin.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdapistd.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdatadst.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdatasrc.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdcoefct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdcolor.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jddctmgr.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdhuff.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdinput.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdmainct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdmarker.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdmaster.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdmerge.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdphuff.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdpostct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdsample.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdtrans.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jerror.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jfdctflt.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jfdctfst.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jfdctint.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jidctflt.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jidctfst.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jidctint.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jidctred.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jmemmgr.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jmemnobs.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jquant1.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jquant2.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jutils.c +# End Source File +# Begin Source File + SOURCE=.\vtkGdcmInit.cxx # End Source File # Begin Source File diff --git a/gdcmPython/win32/gdcmpyembedded.dsp b/gdcmPython/win32/gdcmpyembedded.dsp index e389910b..632798ab 100644 --- a/gdcmPython/win32/gdcmpyembedded.dsp +++ b/gdcmPython/win32/gdcmpyembedded.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # 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 "GDCMPYembedded_EXPORTS" /YX /FD /c -# 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 +# 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 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40c /d "NDEBUG" @@ -57,7 +57,7 @@ LINK32=link.exe # Begin Special Build Tool ProjDir=. SOURCE="$(InputPath)" -PostBuild_Cmds=move $(ProjDir)\gdcm.py $(ProjDir)\..\ +PostBuild_Cmds=move $(ProjDir)\gdcm.py $(ProjDir)\..\ # End Special Build Tool !ELSEIF "$(CFG)" == "gdcmpyembedded - Win32 Debug" @@ -74,7 +74,7 @@ PostBuild_Cmds=move $(ProjDir)\gdcm.py $(ProjDir)\..\ # 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 "GDCMPYembedded_EXPORTS" /YX /FD /GZ /c -# 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 +# 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 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40c /d "_DEBUG" @@ -88,7 +88,7 @@ LINK32=link.exe # Begin Special Build Tool ProjDir=. SOURCE="$(InputPath)" -PostBuild_Cmds=mv $(ProjDir)\gdcm.py $(ProjDir)\..\ +PostBuild_Cmds=mv $(ProjDir)\gdcm.py $(ProjDir)\..\ # End Special Build Tool !ENDIF @@ -177,12 +177,204 @@ SOURCE=..\..\src\gdcmJpeg.cxx # End Source File # Begin Source File +SOURCE=..\..\src\gdcmJpegIdo.cxx +# End Source File +# Begin Source File + +SOURCE=..\..\src\gdcmTS.cxx +# End Source File +# Begin Source File + SOURCE=..\..\src\gdcmUtil.cxx # End Source File # Begin Source File SOURCE=..\..\src\gdcmVR.cxx # End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcapimin.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcapistd.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jccoefct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jccolor.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcdctmgr.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jchuff.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcinit.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcmainct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcmarker.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcmaster.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcomapi.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcparam.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcphuff.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcprepct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcsample.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jctrans.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdapimin.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdapistd.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdatadst.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdatasrc.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdcoefct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdcolor.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jddctmgr.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdhuff.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdinput.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdmainct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdmarker.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdmaster.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdmerge.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdphuff.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdpostct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdsample.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdtrans.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jerror.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jfdctflt.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jfdctfst.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jfdctint.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jidctflt.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jidctfst.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jidctint.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jidctred.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jmemmgr.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jmemnobs.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jquant1.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jquant2.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jutils.c +# End Source File # End Group # Begin Group "Header Files" diff --git a/setup.py b/setup.py index 3d7040f0..6d8eee5d 100644 --- 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 d7db2a06..6c8d8cad 100644 --- a/vtk/win32/vtkGdcmTest.dsp +++ b/vtk/win32/vtkGdcmTest.dsp @@ -74,7 +74,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 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 -# 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 +# 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 !ENDIF diff --git a/vtk/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp index ce44e53b..fc904fbc 100644 --- a/vtk/win32/vtkgdcm.dsp +++ b/vtk/win32/vtkgdcm.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # 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 "VTKGDCM_EXPORTS" /YX /FD /c -# 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 +# 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 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40c /d "NDEBUG" @@ -73,7 +73,7 @@ PostBuild_Cmds=copy ..\..\lib\vtkgdcm.dll ..\ copy Release\vtkgdcm.lib ..\..\lib # 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 "VTKGDCM_EXPORTS" /YX /FD /GZ /c -# 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 +# 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 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40c /d "_DEBUG" @@ -140,6 +140,14 @@ SOURCE=..\..\src\gdcmJpeg.cxx # End Source File # Begin Source File +SOURCE=..\..\src\gdcmJpegIdo.cxx +# End Source File +# Begin Source File + +SOURCE=..\..\src\gdcmTS.cxx +# End Source File +# Begin Source File + SOURCE=..\..\src\gdcmUtil.cxx # End Source File # Begin Source File @@ -148,6 +156,190 @@ SOURCE=..\..\src\gdcmVR.cxx # End Source File # Begin Source File +SOURCE=..\..\src\jpeg\libijg8\jcapimin.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcapistd.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jccoefct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jccolor.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcdctmgr.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jchuff.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcinit.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcmainct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcmarker.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcmaster.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcomapi.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcparam.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcphuff.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcprepct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jcsample.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jctrans.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdapimin.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdapistd.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdatadst.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdatasrc.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdcoefct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdcolor.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jddctmgr.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdhuff.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdinput.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdmainct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdmarker.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdmaster.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdmerge.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdphuff.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdpostct.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdsample.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jdtrans.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jerror.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jfdctflt.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jfdctfst.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jfdctint.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jidctflt.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jidctfst.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jidctint.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jidctred.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jmemmgr.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jmemnobs.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jquant1.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jquant2.c +# End Source File +# Begin Source File + +SOURCE=..\..\src\jpeg\libijg8\jutils.c +# End Source File +# Begin Source File + SOURCE=..\vtkGdcmReader.cxx # End Source File # End Group