*FIX: DOH ! Forgot about windo$e users, they couldn't read lossless jpeg, from medcon...

diff --git a/gdcm.dsw b/gdcm.dsw
index ccf8e51c824dc4b12cf22090e04a571702ba6ee2..264489744c8477e3bd085ed6765c25708b37f3c1 100644 (file)
--- a/gdcm.dsw
+++ b/gdcm.dsw
@@ -11,6 +11,9 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libgdcmljpeg\r
+    End Project Dependency\r
     Begin Project Dependency\r
     Project_Dep_Name libgdcmijpeg8\r
     End Project Dependency\r
@@ -29,6 +32,9 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libgdcmljpeg\r
+    End Project Dependency\r
     Begin Project Dependency\r
     Project_Dep_Name libgdcmijpeg8\r
     End Project Dependency\r
@@ -47,6 +53,9 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libgdcmljpeg\r
+    End Project Dependency\r
     Begin Project Dependency\r
     Project_Dep_Name libgdcmijpeg8\r
     End Project Dependency\r
@@ -96,6 +105,18 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "libgdcmijpeg8"=.\SRC\WIN32\libgdcmljpeg.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "vtkGdcmTest"=.\VTK\WIN32\vtkGdcmTest.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
@@ -119,6 +140,9 @@ Package=<5>
 \r
 Package=<4>\r
 {{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libgdcmljpeg\r
+    End Project Dependency\r
     Begin Project Dependency\r
     Project_Dep_Name libgdcmijpeg8\r
     End Project Dependency\r

diff --git a/src/win32/gdcmdll.dsp b/src/win32/gdcmdll.dsp
index 714fe48d9711b7e54745d3ade01476543bde6366..db51b4a71036522ed4ff93b1729a1950bff2305b 100644 (file)
--- a/src/win32/gdcmdll.dsp
+++ b/src/win32/gdcmdll.dsp
@@ -156,10 +156,6 @@ SOURCE=..\gdcmJpeg2000.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\gdcmJpegIdo.cxx\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\gdcmRLE.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -185,6 +181,10 @@ SOURCE=..\gdcmVR.cxx
 # End Group\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\libgdcmljpeg.lib\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\libgdcmijpeg8.lib\r
 # End Source File\r
 # Begin Source File\r

diff --git a/src/win32/libgdcmljpeg.dsp b/src/win32/libgdcmljpeg.dsp
new file mode 100644 (file)
index 0000000..4f34ffb
--- /dev/null
+++ b/src/win32/libgdcmljpeg.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="libgdcmljpeg" - 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=libgdcmljpeg - 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 "libgdcmljpeg.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 "libgdcmljpeg.mak" CFG="libgdcmljpeg - Win32 Debug"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "libgdcmljpeg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "libgdcmljpeg - 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)" == "libgdcmljpeg - 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__libgdcmljpeg"\r
+# PROP Intermediate_Dir "Release__libgdcmljpeg"\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 "LIBGDCMLJPEG_EXPORTS" /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMLJPEG_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 gdi32.lib kernel32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"..\..\lib\libgdcmljpeg.dll"\r
+# Begin Special Build Tool\r
+SOURCE="$(InputPath)"\r
+PostBuild_Cmds=copy    Release__libgdcmljpeg\libgdcmljpeg.lib    ..\..\lib\    copy    ..\..\lib\libgdcmljpeg.dll    ..\..\gdcmPython\         copy    ..\..\lib\libgdcmljpeg.dll    ..\..\vtk\        copy           ..\..\lib\libgdcmljpeg.dll           ..\..\test\       \r
+# End Special Build Tool\r
+\r
+!ELSEIF  "$(CFG)" == "libgdcmljpeg - 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__libgdcmljpeg"\r
+# PROP Intermediate_Dir "Debug__libgdcmljpeg"\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 "LIBGDCMLJPEG_EXPORTS" /YX /FD /GZ /c\r
+# 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\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 msvcrtd.lib /nologo /dll /debug /machine:I386 /nodefaultlib /out:"..\..\lib\libgdcmljpeg.dll" /pdbtype:sept\r
+# Begin Special Build Tool\r
+SOURCE="$(InputPath)"\r
+PostBuild_Cmds=copy    Debug__libgdcmljpeg\libgdcmljpeg.lib    ..\..\lib\      copy    ..\..\lib\libgdcmljpeg.dll    ..\..\gdcmPython\         copy    ..\..\lib\libgdcmljpeg.dll    ..\..\vtk\        copy           ..\..\lib\libgdcmljpeg.dll           ..\..\test\       \r
+# End Special Build Tool\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "libgdcmljpeg - Win32 Release"\r
+# Name "libgdcmljpeg - 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\ljpg\decomp.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\ljpg\huffd.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\ljpg\jpegutil.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\ljpg\mcu.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\ljpg\predict.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\jpeg\ljpg\read.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