* src/gdcmHeader.h : add std:: prefix for stl elements... like others in

        the file
      * src/gdcmFile.cxx : bug fix in affectation type
      * src/jpeg/libijpeg12/jmorecfg12.h : export for windows modified... like
        in src/jpeg/libijpeg8/jmorecfg8.h (JPR : copy/paste exists !!!)
      * Modifs of MVSC projects to compile them. Not concerning 2 identic
        symbols... futur problem ?
      -- BeNours

diff --git a/ChangeLog b/ChangeLog
index 122c3d6aa95d2e5993cae9ab659698e2cb5e7bad..f6c785a748e23d58f0f33d13e6eccea860747d14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
+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
+      * src/gdcmFile.cxx : bug fix in affectation type
+      * src/jpeg/libijpeg12/jmorecfg12.h : export for windows modified... like
+        in src/jpeg/libijpeg8/jmorecfg8.h (JPR : copy/paste exists !!!)
+      * Modifs of MVSC projects to compile them. Not concerning 2 identic
+        symbols... futur problem ?
 2003-07-29  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
       * src/win32/libgdcmijpeg12.dsp was missing
       * modified gdcm.dsw accordingly
 2003-07-28  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
-          * src/gdcmHeader.cxx : misplaced return 0.; for ACR/NEMA
+      * src/gdcmHeader.cxx : misplaced return 0.; for ACR/NEMA
 2003-07-24 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
       * src/jpeg/libijg12/.cvsignore, jconfig.* : ommited files while last
         commit of JPR (before his hollidays to facilitate our work).

diff --git a/gdcm.dsw b/gdcm.dsw
index 1df4fee2e6ac8e8c03930f2b753a114977fe8d22..53833a8bafa66b59e239153c001b8e194dd71cfa 100644 (file)
--- a/gdcm.dsw
+++ b/gdcm.dsw
@@ -14,6 +14,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libgdcmijpeg8
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libgdcmijpeg12
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -29,6 +32,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libgdcmijpeg8
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libgdcmijpeg12
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -44,6 +50,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libgdcmijpeg8
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libgdcmijpeg12
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -63,7 +72,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "libgdcmijpeg8"=.\SRC\WIN32\libgdcmijpeg8.dsp - Package Owner=<4>
+Project: "libgdcmijpeg12"=.\SRC\WIN32\libgdcmijpeg12.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -75,7 +84,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "libgdcmijpeg12"=.\SRC\WIN32\libgdcmijpeg12.dsp - Package Owner=<4>
+Project: "libgdcmijpeg8"=.\SRC\WIN32\libgdcmijpeg8.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -113,6 +122,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libgdcmijpeg8
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libgdcmijpeg12
+    End Project Dependency
 }}}
 
 ###############################################################################

diff --git a/gdcmPython/win32/_vtkGdcm.dsp b/gdcmPython/win32/_vtkGdcm.dsp
index 4169f21d9b1739f755135935ada54b95a8172247..9ea28f96745fefb40711f0427634627a79c84403 100644 (file)
--- a/gdcmPython/win32/_vtkGdcm.dsp
+++ b/gdcmPython/win32/_vtkGdcm.dsp
@@ -18,7 +18,6 @@ CFG=_vtkGdcm - Win32 Debug
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
 !MESSAGE "_vtkGdcm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "_vtkGdcm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -28,9 +27,6 @@ CFG=_vtkGdcm - Win32 Debug
 CPP=cl.exe\r
 MTL=midl.exe\r
 RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "_vtkGdcm - Win32 Release"\r
-\r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
 # PROP BASE Output_Dir "Release"\r
@@ -54,39 +50,9 @@ BSC32=bscmake.exe
 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 Wsock32.lib /nologo /dll /machine:I386 /out:"..\vtkgdcmPython.dll"\r
-\r
-!ELSEIF  "$(CFG)" == "_vtkGdcm - 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"\r
-# PROP Intermediate_Dir "Debug"\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 "_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
-# 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:"..\vtkGdcmPython.dll" /pdbtype:sept\r
-\r
-!ENDIF \r
-\r
 # Begin Target\r
 \r
 # Name "_vtkGdcm - Win32 Release"\r
-# Name "_vtkGdcm - Win32 Debug"\r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
@@ -132,10 +98,22 @@ SOURCE=..\..\src\gdcmJpeg.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\gdcmJpeg12.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmJpeg2000.cxx\r
+# 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\gdcmRLE.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\gdcmTS.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -165,9 +143,6 @@ SOURCE=..\vtkGdcmReaderPython.cxx
 # Begin Source File\r
 \r
 SOURCE=.\init.h\r
-\r
-!IF  "$(CFG)" == "_vtkGdcm - Win32 Release"\r
-\r
 # Begin Custom Build - Performing Custom Build Step on $(VTKPATH)\bin\initwrappythonwin32 vtkgdcmPython vtkGdmReader > $(ProjDir)\vtkGdcmInit.cxx\r
 ProjDir=.\r
 InputPath=.\init.h\r
@@ -176,18 +151,10 @@ InputPath=.\init.h
        $(VTKPATH)\bin\initwrappythonwin32 vtkgdcmPython vtkGdcmReader > $(ProjDir)\vtkGdcmInit.cxx\r
 \r
 # End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "_vtkGdcm - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\vtk\vtkGdcmReader.h\r
-\r
-!IF  "$(CFG)" == "_vtkGdcm - Win32 Release"\r
-\r
 # Begin Custom Build - Performing Custom Build Step on $(VTKPATH)\bin\vtkwrappython "$(InputDir)\$(InputName).h" $(VTKPATH)\Examples\Build\vtkMy\Wrapping\hints 1  $(ProjDir)\..\$(InputName)Python.cxx\r
 InputDir=\Projects\gdcm\vtk\r
 ProjDir=.\r
@@ -198,11 +165,6 @@ InputName=vtkGdcmReader
        $(VTKPATH)\bin\vtkwrappython "$(InputDir)\$(InputName).h" $(VTKPATH)\Examples\Build\vtkMy\Wrapping\hints 1  $(ProjDir)\..\$(InputName)Python.cxx\r
 \r
 # End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "_vtkGdcm - Win32 Debug"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # End Group\r
 # Begin Group "Resource Files"\r
@@ -241,5 +203,9 @@ SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkFiltering.lib
 \r
 SOURCE=..\..\lib\libgdcmijpeg8.lib\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\libgdcmijpeg12.lib\r
+# End Source File\r
 # End Target\r
 # End Project\r

diff --git a/gdcmPython/win32/gdcmpyembedded.dsp b/gdcmPython/win32/gdcmpyembedded.dsp
index 17cbfff7eb439a2fc981142f5adeea34c3c011f2..6e562b890f4a3fc30ac9f4f5404c2d971fe49bb9 100644 (file)
--- a/gdcmPython/win32/gdcmpyembedded.dsp
+++ b/gdcmPython/win32/gdcmpyembedded.dsp
@@ -4,7 +4,7 @@
 \r
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
 \r
-CFG=gdcmpyembedded - Win32 Debug\r
+CFG=gdcmpyembedded - Win32 Release\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
@@ -13,12 +13,11 @@ CFG=gdcmpyembedded - Win32 Debug
 !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 "gdcmpyembedded.mak" CFG="gdcmpyembedded - Win32 Debug"\r
+!MESSAGE NMAKE /f "gdcmpyembedded.mak" CFG="gdcmpyembedded - Win32 Release"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
 !MESSAGE "gdcmpyembedded - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "gdcmpyembedded - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -28,9 +27,6 @@ CFG=gdcmpyembedded - Win32 Debug
 CPP=cl.exe\r
 MTL=midl.exe\r
 RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "gdcmpyembedded - Win32 Release"\r
-\r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
 # PROP BASE Output_Dir "gdcmpyembedded___Win32_Release"\r
@@ -57,55 +53,17 @@ 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
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "gdcmpyembedded___Win32_Debug"\r
-# PROP BASE Intermediate_Dir "gdcmpyembedded___Win32_Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "gdcmpyembedded___Win32_Debug"\r
-# PROP Intermediate_Dir "gdcmpyembedded___Win32_Debug"\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 "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
-# 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 advapi32.lib shell32.lib Wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\_gdcm_d.dll" /pdbtype:sept\r
-# Begin Special Build Tool\r
-ProjDir=.\r
-SOURCE="$(InputPath)"\r
-PostBuild_Cmds=mv            $(ProjDir)\gdcm.py            $(ProjDir)\..\ \r
-# End Special Build Tool\r
-\r
-!ENDIF \r
-\r
 # Begin Target\r
 \r
 # Name "gdcmpyembedded - Win32 Release"\r
-# Name "gdcmpyembedded - 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=..\gdcm.i\r
-\r
-!IF  "$(CFG)" == "gdcmpyembedded - Win32 Release"\r
-\r
 # Begin Custom Build\r
 ProjDir=.\r
 InputPath=..\gdcm.i\r
@@ -115,21 +73,6 @@ InputName=gdcm
        C:\creatis\SWIG\swig -python -c++ -I..\..\src -o $(ProjDir)\$(InputName)_wrap.cxx $(InputPath)\r
 \r
 # End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "gdcmpyembedded - Win32 Debug"\r
-\r
-# Begin Custom Build - Performing Custom Build Step on $(InputPath)\r
-ProjDir=.\r
-InputPath=..\gdcm.i\r
-InputName=gdcm\r
-\r
-"$(ProjDir)\$(InputName)_wrap.cxx" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       C:\creatis\SWIG\swig -python -c++ -I..\..\src -o $(ProjDir)\$(InputName)_wrap.cxx $(InputPath)\r
-\r
-# End Custom Build\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -177,10 +120,22 @@ SOURCE=..\..\src\gdcmJpeg.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\gdcmJpeg12.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmJpeg2000.cxx\r
+# 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\gdcmRLE.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\gdcmTS.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -208,5 +163,9 @@ SOURCE=c:\Creatis\Python22\libs\python22.lib
 \r
 SOURCE=..\..\lib\libgdcmijpeg8.lib\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\libgdcmijpeg12.lib\r
+# End Source File\r
 # End Target\r
 # End Project\r

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 2721d9ad1e8d57bc771472ffed29920ed7006875..29cd7a76294d833cfb9c7c9608092287fe09d2cc 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -396,7 +396,7 @@ bool gdcmFile::ReadPixelData(void* destination) {
          
          // FIXME : will work only when each fragment corresponds to a Frame :-(
          
-         (char *) destination += taille * nBytes; // location in user's memory 
+         destination = (char *)destination + taille * nBytes; // location in user's memory 
                                                   // for next fragment (if any) 
          // TODO : find a suitable file (multifragment/single Frame Jpeg file) to check
          

diff --git a/src/jpeg/libijg12/jmorecfg12.h b/src/jpeg/libijg12/jmorecfg12.h
index a590351dd44b2ed65f720352d5c950e5a8e02faf..d10fb8f1d080c6b3414a0eaff1f942f28fe88301 100644 (file)
--- a/src/jpeg/libijg12/jmorecfg12.h
+++ b/src/jpeg/libijg12/jmorecfg12.h
@@ -185,9 +185,17 @@ typedef unsigned int JDIMENSION;
 /* a function used only in its module: */
 #define LOCAL(type)            static type
 /* a function referenced thru EXTERNs: */
-#define GLOBAL(type)           type
+#ifdef WIN32
+  #define GLOBAL(type)         __declspec( dllexport ) type
+#else
+  #define GLOBAL(type)         type
+#endif
 /* a reference to a GLOBAL function: */
-#define EXTERN(type)           extern type
+#ifdef WIN32
+  #define EXTERN(type)         extern __declspec( dllexport ) type
+#else
+  #define EXTERN(type)         extern type
+#endif
 
 
 /* This macro is used to declare a "method", that is, a function pointer.

diff --git a/src/win32/gdcmdll.dsp b/src/win32/gdcmdll.dsp
index 7d0a42ab0774567eeacd9b39c9d63dc8c0a7c9a9..ec2cd8f50bad1e2f257c70e1cc076b6b593d79a5 100644 (file)
--- a/src/win32/gdcmdll.dsp
+++ b/src/win32/gdcmdll.dsp
@@ -58,7 +58,7 @@ LINK32=link.exe
 # Begin Special Build Tool\r
 SOURCE="$(InputPath)"\r
 PostBuild_Desc=Copy for test\r
-PostBuild_Cmds=copy        ..\..\lib\gdcmdll.dll        ..\..\gdcmPython\      copy        ..\..\lib\gdcmdll.dll        ..\..\test\            copy     Release\gdcmdll.lib     ..\..\lib\ \r
+PostBuild_Cmds=copy         ..\..\lib\gdcmdll.dll         ..\..\gdcmPython\            copy         ..\..\lib\gdcmdll.dll         ..\..\test\          copy      Release\gdcmdll.lib      ..\..\lib\ \r
 # End Special Build Tool\r
 \r
 !ELSEIF  "$(CFG)" == "gdcmdll - Win32 Debug"\r
@@ -90,7 +90,7 @@ LINK32=link.exe
 # Begin Special Build Tool\r
 SOURCE="$(InputPath)"\r
 PostBuild_Desc=Copy for test\r
-PostBuild_Cmds=copy        ..\..\lib\gdcmdll.dll        ..\..\gdcmPython\      copy        ..\..\lib\gdcmdll.dll        ..\..\test\            copy     Debug\gdcmdll.lib     ..\..\lib\ \r
+PostBuild_Cmds=copy         ..\..\lib\gdcmdll.dll         ..\..\gdcmPython\            copy         ..\..\lib\gdcmdll.dll         ..\..\test\          copy      Debug\gdcmdll.lib      ..\..\lib\ \r
 # End Special Build Tool\r
 \r
 !ENDIF \r
@@ -144,10 +144,22 @@ SOURCE=..\gdcmJpeg.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\gdcmJpeg12.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\gdcmJpeg2000.cxx\r
+# 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
+\r
 SOURCE=..\gdcmTS.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -171,5 +183,9 @@ SOURCE=..\gdcmVR.cxx
 \r
 SOURCE=..\..\lib\libgdcmijpeg8.lib\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\libgdcmijpeg12.lib\r
+# End Source File\r
 # End Target\r
 # End Project\r

diff --git a/src/win32/libgdcmijpeg12.dsp b/src/win32/libgdcmijpeg12.dsp
index 6bf0ec45d0a9415dbff4c0cb4ce8de5bf6a8861d..d2dc9c7b14eb18d79684c9a16da5ba14cca90c29 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>\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
+# 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

diff --git a/src/win32/libgdcmijpeg8.dsp b/src/win32/libgdcmijpeg8.dsp
index 5e30cdcec7261ad1198a094644c09e023e29db33..38a89150c84498cd088274aec45454ca50885afe 100644 (file)
--- a/src/win32/libgdcmijpeg8.dsp
+++ b/src/win32/libgdcmijpeg8.dsp
@@ -56,7 +56,7 @@ LINK32=link.exe
 # 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\libgdcmijpeg8.dll"\r
 # Begin Special Build Tool\r
 SOURCE="$(InputPath)"\r
-PostBuild_Cmds=copy  Release__libgdcmijpeg8\libgdcmijpeg8.lib  ..\..\lib\      copy  ..\..\lib\libgdcmijpeg8.dll  ..\..\gdcmPython\    copy  ..\..\lib\libgdcmijpeg8.dll  ..\..\vtk\ \r
+PostBuild_Cmds=copy   Release__libgdcmijpeg8\libgdcmijpeg8.lib   ..\..\lib\    copy   ..\..\lib\libgdcmijpeg8.dll   ..\..\gdcmPython\          copy   ..\..\lib\libgdcmijpeg8.dll   ..\..\vtk\ \r
 # End Special Build Tool\r
 \r
 !ELSEIF  "$(CFG)" == "libgdcmijpeg8 - Win32 Debug"\r
@@ -72,8 +72,8 @@ PostBuild_Cmds=copy  Release__libgdcmijpeg8\libgdcmijpeg8.lib  ..\..\lib\     copy
 # PROP Intermediate_Dir "Debug__libgdcmijpeg8"\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 "LIBGDCMIJPEG8_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 "LIBGDCMIJPEG8_EXPORTS" /YX /FD /GZ  /c\r
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGDCMIJPEG8_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 "LIBGDCMIJPEG8_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
@@ -86,7 +86,7 @@ LINK32=link.exe
 # 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\libgdcmijpeg8.dll" /pdbtype:sept\r
 # Begin Special Build Tool\r
 SOURCE="$(InputPath)"\r
-PostBuild_Cmds=copy  Debug__libgdcmijpeg8\libgdcmijpeg8.lib  ..\..\lib\        copy  ..\..\lib\libgdcmijpeg8.dll  ..\..\gdcmPython\    copy  ..\..\lib\libgdcmijpeg8.dll  ..\..\vtk\ \r
+PostBuild_Cmds=copy   Debug__libgdcmijpeg8\libgdcmijpeg8.lib   ..\..\lib\      copy   ..\..\lib\libgdcmijpeg8.dll   ..\..\gdcmPython\          copy   ..\..\lib\libgdcmijpeg8.dll   ..\..\vtk\ \r
 # End Special Build Tool\r
 \r
 !ENDIF \r

diff --git a/vtk/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp
index 92a7f89e2000aa24fd38864ea308ccd613f0c212..a1ce77c566c116c7177e721620d2df3f8f2c90a8 100644 (file)
--- a/vtk/win32/vtkgdcm.dsp
+++ b/vtk/win32/vtkgdcm.dsp
@@ -140,10 +140,22 @@ SOURCE=..\..\src\gdcmJpeg.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\gdcmJpeg12.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\gdcmJpeg2000.cxx\r
+# 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\gdcmRLE.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\gdcmTS.cxx\r
 # End Source File\r
 # Begin Source File\r
@@ -183,5 +195,9 @@ SOURCE=c:\Creatis\vtkDistrib\lib\vtk\vtkFiltering.lib
 \r
 SOURCE=..\..\lib\libgdcmijpeg8.lib\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\lib\libgdcmijpeg12.lib\r
+# End Source File\r
 # End Target\r
 # End Project\r