Commits

Christian Heimes committed a6ac380 Draft

Include from LibJPEGTurbo

Comments (0)

Files changed (7)

Source/FreeImage/PluginJPEG.cpp

 #undef FAR
 #include <setjmp.h>
 
-#include "../LibJPEG/jinclude.h"
-#include "../LibJPEG/jpeglib.h"
-#include "../LibJPEG/jerror.h"
+#include "../LibJPEGTurbo/jinclude.h"
+#include "../LibJPEGTurbo/jpeglib.h"
+#include "../LibJPEGTurbo/jerror.h"
 }
 
 #include "FreeImage.h"

Source/FreeImageToolkit/JPEGTransform.cpp

 #undef FAR
 #include <setjmp.h>
 
-#include "../LibJPEG/jinclude.h"
-#include "../LibJPEG/jpeglib.h"
-#include "../LibJPEG/jerror.h"
-#include "../LibJPEG/transupp.h"
+#include "../LibJPEGTurbo/jinclude.h"
+#include "../LibJPEGTurbo/jpeglib.h"
+#include "../LibJPEGTurbo/jerror.h"
+#include "../LibJPEGTurbo/transupp.h"
 }
 
 #include "FreeImage.h"

Source/LibMNG/libmng_types.h

 #undef FAR                             /* possibly defined by zlib or lcms */
 #endif
 #define JPEG_INTERNAL_OPTIONS          /* for RGB_PIXELSIZE */
-#include "../LibJPEG/jpeglib.h"        /* all that for JPEG support  :-) */
+#include "../LibJPEGTurbo/jpeglib.h"        /* all that for JPEG support  :-) */
 #endif /* MNG_INCLUDE_IJG6B */
 
 #if defined(MNG_INTERNAL_MEMMNGMT) || defined(MNG_INCLUDE_FILTERS)

Source/LibTIFF/tif_jpeg.c

 # define HAVE_BOOLEAN            /* prevent jmorecfg.h from redefining it */
 #endif
 
-#include "../LibJPEG/jpeglib.h"
-#include "../LibJPEG/jerror.h"
+#include "../LibJPEGTurbo/jpeglib.h"
+#include "../LibJPEGTurbo/jerror.h"
 
 /*
  * We are using width_in_blocks which is supposed to be private to

Source/LibTIFF/tif_ojpeg.c

 #include <setjmp.h>
 #endif
 
-#include "../LibJPEG/jpeglib.h"
-#include "../LibJPEG/jerror.h"
+#include "../LibJPEGTurbo/jpeglib.h"
+#include "../LibJPEGTurbo/jerror.h"
 
 typedef struct jpeg_error_mgr jpeg_error_mgr;
 typedef struct jpeg_common_struct jpeg_common_struct;

Source/LibTIFF4/tif_jpeg.c

 # define HAVE_BOOLEAN            /* prevent jmorecfg.h from redefining it */
 #endif
 
-#include "../LibJPEG/jpeglib.h"
-#include "../LibJPEG/jerror.h"
+#include "../LibJPEGTurbo/jpeglib.h"
+#include "../LibJPEGTurbo/jerror.h"
 
 /* 
  * Do we want to do special processing suitable for when JSAMPLE is a

Source/LibTIFF4/tif_ojpeg.c

 # define HAVE_BOOLEAN            /* prevent jmorecfg.h from redefining it */
 #endif
 
-#include "../LibJPEG/jpeglib.h"
-#include "../LibJPEG/jerror.h"
+#include "../LibJPEGTurbo/jpeglib.h"
+#include "../LibJPEGTurbo/jerror.h"
 
 typedef struct jpeg_error_mgr jpeg_error_mgr;
 typedef struct jpeg_common_struct jpeg_common_struct;