From: malaterre Date: Wed, 29 Oct 2003 17:07:01 +0000 (+0000) Subject: *FIX: DOH ! Forgot about windo$e users, they couldn't read lossless jpeg, from medcon... X-Git-Tag: Version0.3.1~78 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=369120e95752c4f0abceb6ed11fce1f248c9e8b8;p=gdcm.git *FIX: DOH ! Forgot about windo$e users, they couldn't read lossless jpeg, from medcon lib ! --- diff --git a/gdcm.dsw b/gdcm.dsw index ccf8e51c..26448974 100644 --- a/gdcm.dsw +++ b/gdcm.dsw @@ -11,6 +11,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name libgdcmljpeg + End Project Dependency Begin Project Dependency Project_Dep_Name libgdcmijpeg8 End Project Dependency @@ -29,6 +32,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name libgdcmljpeg + End Project Dependency Begin Project Dependency Project_Dep_Name libgdcmijpeg8 End Project Dependency @@ -47,6 +53,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name libgdcmljpeg + End Project Dependency Begin Project Dependency Project_Dep_Name libgdcmijpeg8 End Project Dependency @@ -96,6 +105,18 @@ Package=<4> ############################################################################### +Project: "libgdcmijpeg8"=.\SRC\WIN32\libgdcmljpeg.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "vtkGdcmTest"=.\VTK\WIN32\vtkGdcmTest.dsp - Package Owner=<4> Package=<5> @@ -119,6 +140,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name libgdcmljpeg + End Project Dependency Begin Project Dependency Project_Dep_Name libgdcmijpeg8 End Project Dependency diff --git a/src/win32/gdcmdll.dsp b/src/win32/gdcmdll.dsp index 714fe48d..db51b4a7 100644 --- a/src/win32/gdcmdll.dsp +++ b/src/win32/gdcmdll.dsp @@ -156,10 +156,6 @@ SOURCE=..\gdcmJpeg2000.cxx # End Source File # Begin Source File -SOURCE=..\gdcmJpegIdo.cxx -# End Source File -# Begin Source File - SOURCE=..\gdcmRLE.cxx # End Source File # Begin Source File @@ -185,6 +181,10 @@ SOURCE=..\gdcmVR.cxx # End Group # Begin Source File +SOURCE=..\..\lib\libgdcmljpeg.lib +# End Source File +# Begin Source File + SOURCE=..\..\lib\libgdcmijpeg8.lib # End Source File # Begin Source File diff --git a/src/win32/libgdcmljpeg.dsp b/src/win32/libgdcmljpeg.dsp new file mode 100644 index 00000000..4f34ffb1 --- /dev/null +++ b/src/win32/libgdcmljpeg.dsp @@ -0,0 +1,135 @@ +# Microsoft Developer Studio Project File - Name="libgdcmljpeg" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=libgdcmljpeg - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libgdcmljpeg.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libgdcmljpeg.mak" CFG="libgdcmljpeg - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libgdcmljpeg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libgdcmljpeg - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libgdcmljpeg - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release__libgdcmljpeg" +# PROP Intermediate_Dir "Release__libgdcmljpeg" +# 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 "LIBGDCMLJPEG_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMLJPEG_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" +# ADD RSC /l 0x40c /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 gdi32.lib kernel32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"..\..\lib\libgdcmljpeg.dll" +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Release__libgdcmljpeg\libgdcmljpeg.lib ..\..\lib\ copy ..\..\lib\libgdcmljpeg.dll ..\..\gdcmPython\ copy ..\..\lib\libgdcmljpeg.dll ..\..\vtk\ copy ..\..\lib\libgdcmljpeg.dll ..\..\test\ +# End Special Build Tool + +!ELSEIF "$(CFG)" == "libgdcmljpeg - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug__libgdcmljpeg" +# PROP Intermediate_Dir "Debug__libgdcmljpeg" +# 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 "LIBGDCMLJPEG_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMLJPEG_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" +# ADD RSC /l 0x40c /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib msvcrtd.lib /nologo /dll /debug /machine:I386 /nodefaultlib /out:"..\..\lib\libgdcmljpeg.dll" /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=copy Debug__libgdcmljpeg\libgdcmljpeg.lib ..\..\lib\ copy ..\..\lib\libgdcmljpeg.dll ..\..\gdcmPython\ copy ..\..\lib\libgdcmljpeg.dll ..\..\vtk\ copy ..\..\lib\libgdcmljpeg.dll ..\..\test\ +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "libgdcmljpeg - Win32 Release" +# Name "libgdcmljpeg - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\jpeg\ljpg\decomp.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\ljpg\huffd.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\ljpg\jpegutil.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\ljpg\mcu.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\ljpg\predict.c +# End Source File +# Begin Source File + +SOURCE=..\jpeg\ljpg\read.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project