Sorry, didn't realize named had changed .c -> 12.c

diff --git a/src/jpeg/libijg12/jerror12.c b/src/jpeg/libijg12/jerror12.c
index 333ca38622d8503ab4b392049be1f9bc605eaa84..d163419d648176db4f83e04f2be287ddd0a30dbb 100644 (file)
--- a/src/jpeg/libijg12/jerror12.c
+++ b/src/jpeg/libijg12/jerror12.c
@@ -48,7 +48,7 @@
 #define JMESSAGE(code,string)  string ,
 
 const char * const jpeg_std_message_table[] = {
-#include "jerror.h"
+#include "jerror12.h"
   NULL
 };
 

diff --git a/src/win32/libgdcmijpeg12.dsp b/src/win32/libgdcmijpeg12.dsp
index 03af71f2f1af4564b9a2faf1633947eb74bba40e..6bf0ec45d0a9415dbff4c0cb4ce8de5bf6a8861d 100644 (file)
--- a/src/win32/libgdcmijpeg12.dsp
+++ b/src/win32/libgdcmijpeg12.dsp
@@ -100,187 +100,187 @@ PostBuild_Cmds=copy  Debug__libgdcmijpeg12\libgdcmijpeg12.lib  ..\..\lib\       copy
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jcapimin.c\r
+SOURCE=..\jpeg\libijg12\jcapimin12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jcapistd.c\r
+SOURCE=..\jpeg\libijg12\jcapistd12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jccoefct.c\r
+SOURCE=..\jpeg\libijg12\jccoefct12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jccolor.c\r
+SOURCE=..\jpeg\libijg12\jccolor12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jcdctmgr.c\r
+SOURCE=..\jpeg\libijg12\jcdctmgr12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jchuff.c\r
+SOURCE=..\jpeg\libijg12\jchuff12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jcinit.c\r
+SOURCE=..\jpeg\libijg12\jcinit12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jcmainct.c\r
+SOURCE=..\jpeg\libijg12\jcmainct12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jcmarker.c\r
+SOURCE=..\jpeg\libijg12\jcmarker12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jcmaster.c\r
+SOURCE=..\jpeg\libijg12\jcmaster12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jcomapi.c\r
+SOURCE=..\jpeg\libijg12\jcomapi12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jcparam.c\r
+SOURCE=..\jpeg\libijg12\jcparam12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jcphuff.c\r
+SOURCE=..\jpeg\libijg12\jcphuff12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jcprepct.c\r
+SOURCE=..\jpeg\libijg12\jcprepct12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jcsample.c\r
+SOURCE=..\jpeg\libijg12\jcsample12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jctrans.c\r
+SOURCE=..\jpeg\libijg12\jctrans12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdapimin.c\r
+SOURCE=..\jpeg\libijg12\jdapimin12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdapistd.c\r
+SOURCE=..\jpeg\libijg12\jdapistd12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdatadst.c\r
+SOURCE=..\jpeg\libijg12\jdatadst12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdatasrc.c\r
+SOURCE=..\jpeg\libijg12\jdatasrc12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdcoefct.c\r
+SOURCE=..\jpeg\libijg12\jdcoefct12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdcolor.c\r
+SOURCE=..\jpeg\libijg12\jdcolor12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jddctmgr.c\r
+SOURCE=..\jpeg\libijg12\jddctmgr12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdhuff.c\r
+SOURCE=..\jpeg\libijg12\jdhuff12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdinput.c\r
+SOURCE=..\jpeg\libijg12\jdinput12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdmainct.c\r
+SOURCE=..\jpeg\libijg12\jdmainct12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdmarker.c\r
+SOURCE=..\jpeg\libijg12\jdmarker12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdmaster.c\r
+SOURCE=..\jpeg\libijg12\jdmaster12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdmerge.c\r
+SOURCE=..\jpeg\libijg12\jdmerge12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdphuff.c\r
+SOURCE=..\jpeg\libijg12\jdphuff12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdpostct.c\r
+SOURCE=..\jpeg\libijg12\jdpostct12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdsample.c\r
+SOURCE=..\jpeg\libijg12\jdsample12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jdtrans.c\r
+SOURCE=..\jpeg\libijg12\jdtrans12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jerror.c\r
+SOURCE=..\jpeg\libijg12\jerror12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jfdctflt.c\r
+SOURCE=..\jpeg\libijg12\jfdctflt12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jfdctfst.c\r
+SOURCE=..\jpeg\libijg12\jfdctfst12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jfdctint.c\r
+SOURCE=..\jpeg\libijg12\jfdctint12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jidctflt.c\r
+SOURCE=..\jpeg\libijg12\jidctflt12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jidctfst.c\r
+SOURCE=..\jpeg\libijg12\jidctfst12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jidctint.c\r
+SOURCE=..\jpeg\libijg12\jidctint12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jidctred.c\r
+SOURCE=..\jpeg\libijg12\jidctred12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jmemmgr.c\r
+SOURCE=..\jpeg\libijg12\jmemmgr12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jmemnobs.c\r
+SOURCE=..\jpeg\libijg12\jmemnobs12.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jquant1.c\r
+SOURCE=..\jpeg\libijg12\jquant112.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jquant2.c\r
+SOURCE=..\jpeg\libijg12\jquant212.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\jpeg\libijg12\jutils.c\r
+SOURCE=..\jpeg\libijg12\jutils12.c\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r