* src/win32/libgdcmjpeg12.dsp was not dos format

* src/win32/libgdcmjpeg12.dsp : libgdcmijpeg12_EXPORTS -> LIBGDCMIJPEG12_EXPORTS
* src/win32/gdcmdll.dsp: + /I "..\jpeg\libijg12"

diff --git a/ChangeLog b/ChangeLog
index f6c785a748e23d58f0f33d13e6eccea860747d14..e69a2b45ff17e5247c8c1814d01b1faac80ecfab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-29  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
+      * src/win32/libgdcmjpeg12.dsp was not dos format
+      * src/win32/libgdcmjpeg12.dsp : libgdcmijpeg12_EXPORTS -> LIBGDCMIJPEG12_EXPORTS
+      * src/win32/gdcmdll.dsp: + /I "..\jpeg\libijg12"
 2003-07-29 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
       * src/gdcmHeader.h : add std:: prefix for stl elements... like others in
         the file

diff --git a/src/win32/gdcmdll.dsp b/src/win32/gdcmdll.dsp
index ec2cd8f50bad1e2f257c70e1cc076b6b593d79a5..34fb5ceb9f432efc5dba43360b92f50c55182d40 100644 (file)
--- a/src/win32/gdcmdll.dsp
+++ b/src/win32/gdcmdll.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 "GDCMDLL_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /w /W0 /GX /O2 /I "$(CREATIS)\glib-1.3\src\glib" /I "..\jpeg\libijg8" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /c\r
+# ADD CPP /nologo /MD /w /W0 /GX /O2 /I "$(CREATIS)\glib-1.3\src\glib" /I "..\jpeg\libijg8" /I "..\jpeg\libijg12" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_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
@@ -75,7 +75,7 @@ PostBuild_Cmds=copy         ..\..\lib\gdcmdll.dll         ..\..\gdcmPython\
 # 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 "GDCMDLL_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /w /W0 /Gm /GX /ZI /Od /I "$(CREATIS)\glib-1.3\src\glib" /I "..\jpeg\libijg8" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_EXPORTS" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /w /W0 /Gm /GX /ZI /Od /I "$(CREATIS)\glib-1.3\src\glib" /I "..\jpeg\libijg8" /I "..\jpeg\libijg12" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDCMDLL_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

diff --git a/src/win32/libgdcmijpeg12.dsp b/src/win32/libgdcmijpeg12.dsp
index d2dc9c7b14eb18d79684c9a16da5ba14cca90c29..05708cb5d7b05dace6de7b8835728a86e7984876 100644 (file)
--- a/src/win32/libgdcmijpeg12.dsp
+++ b/src/win32/libgdcmijpeg12.dsp
@@ -1,295 +1,295 @@
-# Microsoft Developer Studio Project File - Name="libgdcmijpeg12" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=libgdcmijpeg12 - 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 "libgdcmijpeg12.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 "libgdcmijpeg12.mak" CFG="libgdcmijpeg12 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libgdcmijpeg12 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libgdcmijpeg12 - 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)" == "libgdcmijpeg12 - 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__libgdcmijpeg12"
-# PROP Intermediate_Dir "Release__libgdcmijpeg12"
-# 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 "libgdcmijpeg12_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMIJPEG12_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 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\libgdcmijpeg12.dll"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy   Release__libgdcmijpeg12\libgdcmijpeg12.lib   ..\..\lib\          copy   ..\..\lib\libgdcmijpeg12.dll   ..\..\gdcmPython\         copy   ..\..\lib\libgdcmijpeg12.dll   ..\..\vtk\ 
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "libgdcmijpeg12 - 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__libgdcmijpeg12"
-# PROP Intermediate_Dir "Debug__libgdcmijpeg12"
-# 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 "libgdcmijpeg12_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMIJPEG12_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 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\libgdcmijpeg12.dll" /pdbtype:sept
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy   Debug__libgdcmijpeg12\libgdcmijpeg12.lib   ..\..\lib\    copy   ..\..\lib\libgdcmijpeg12.dll   ..\..\gdcmPython\         copy   ..\..\lib\libgdcmijpeg12.dll   ..\..\vtk\ 
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libgdcmijpeg12 - Win32 Release"
-# Name "libgdcmijpeg12 - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jcapimin12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jcapistd12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jccoefct12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jccolor12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jcdctmgr12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jchuff12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jcinit12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jcmainct12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jcmarker12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jcmaster12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jcomapi12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jcparam12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jcphuff12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jcprepct12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jcsample12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jctrans12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdapimin12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdapistd12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdatadst12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdatasrc12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdcoefct12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdcolor12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jddctmgr12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdhuff12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdinput12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdmainct12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdmarker12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdmaster12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdmerge12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdphuff12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdpostct12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdsample12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jdtrans12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jerror12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jfdctflt12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jfdctfst12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jfdctint12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jidctflt12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jidctfst12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jidctint12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jidctred12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jmemmgr12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jmemnobs12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jquant112.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jquant212.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\jpeg\libijg12\jutils12.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
+# Microsoft Developer Studio Project File - Name="libgdcmijpeg12" - 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=libgdcmijpeg12 - 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 "libgdcmijpeg12.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 "libgdcmijpeg12.mak" CFG="libgdcmijpeg12 - Win32 Debug"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "libgdcmijpeg12 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "libgdcmijpeg12 - 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)" == "libgdcmijpeg12 - 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__libgdcmijpeg12"\r
+# PROP Intermediate_Dir "Release__libgdcmijpeg12"\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 "LIBGDCMIJPEG12_EXPORTS" /YX /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMIJPEG12_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\libgdcmijpeg12.dll"\r
+# Begin Special Build Tool\r
+SOURCE="$(InputPath)"\r
+PostBuild_Cmds=copy   Release__libgdcmijpeg12\libgdcmijpeg12.lib   ..\..\lib\          copy   ..\..\lib\libgdcmijpeg12.dll   ..\..\gdcmPython\         copy   ..\..\lib\libgdcmijpeg12.dll   ..\..\vtk\ \r
+# End Special Build Tool\r
+\r
+!ELSEIF  "$(CFG)" == "libgdcmijpeg12 - 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__libgdcmijpeg12"\r
+# PROP Intermediate_Dir "Debug__libgdcmijpeg12"\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 "LIBGDCMIJPEG12_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 "LIBGDCMIJPEG12_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\libgdcmijpeg12.dll" /pdbtype:sept\r
+# Begin Special Build Tool\r
+SOURCE="$(InputPath)"\r
+PostBuild_Cmds=copy   Debug__libgdcmijpeg12\libgdcmijpeg12.lib   ..\..\lib\    copy   ..\..\lib\libgdcmijpeg12.dll   ..\..\gdcmPython\         copy   ..\..\lib\libgdcmijpeg12.dll   ..\..\vtk\ \r
+# End Special Build Tool\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "libgdcmijpeg12 - Win32 Release"\r
+# Name "libgdcmijpeg12 - 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\libijg12\jcapimin12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcapistd12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jccoefct12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jccolor12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcdctmgr12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jchuff12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcinit12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcmainct12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcmarker12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcmaster12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcomapi12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcparam12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcphuff12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcprepct12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jcsample12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jctrans12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdapimin12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdapistd12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdatadst12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdatasrc12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdcoefct12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdcolor12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jddctmgr12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdhuff12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdinput12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdmainct12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdmarker12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdmaster12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdmerge12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdphuff12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdpostct12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdsample12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jdtrans12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jerror12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jfdctflt12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jfdctfst12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jfdctint12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jidctflt12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jidctfst12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jidctint12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jidctred12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jmemmgr12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jmemnobs12.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jquant112.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jquant212.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\libijg12\jutils12.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/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp
index a1ce77c566c116c7177e721620d2df3f8f2c90a8..90a718960f4a15a0d6810251008d7ca81df428f9 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" /I "..\..\src\jpeg\libijg8" /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" /I "..\..\src\jpeg\libijg12" /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" /I "..\..\src\jpeg\libijg8" /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" /I "..\..\src\jpeg\libijg12" /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