| Index: core/include/thirdparties/libjpeg/jconfig.h
|
| diff --git a/core/include/thirdparties/libjpeg/jconfig.h b/core/include/thirdparties/libjpeg/jconfig.h
|
| index ea3c39779966bf6eb555b1a7ba3d665ba20d92f0..252ea807914fc9c16d29a678e9f1b4e5969eede1 100644
|
| --- a/core/include/thirdparties/libjpeg/jconfig.h
|
| +++ b/core/include/thirdparties/libjpeg/jconfig.h
|
| @@ -17,16 +17,15 @@
|
| #define HAVE_STDLIB_H
|
| #undef NEED_BSD_STRINGS
|
| #undef NEED_SYS_TYPES_H
|
| -#undef NEED_FAR_POINTERS /* we presume a 32-bit flat memory model */
|
| +#undef NEED_FAR_POINTERS /* we presume a 32-bit flat memory model */
|
| #undef NEED_SHORT_EXTERNAL_NAMES
|
| #undef INCOMPLETE_TYPES_BROKEN
|
|
|
| /* Define "boolean" as unsigned char, not int, per Windows custom */
|
| -#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
|
| +#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
|
| typedef unsigned char boolean;
|
| #endif
|
| -#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
|
| -
|
| +#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
|
|
|
| #ifdef JPEG_INTERNALS
|
|
|
| @@ -36,16 +35,16 @@ typedef unsigned char boolean;
|
|
|
| #ifdef JPEG_CJPEG_DJPEG
|
|
|
| -#define BMP_SUPPORTED /* BMP image file format */
|
| -#define GIF_SUPPORTED /* GIF image file format */
|
| -#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
|
| -#undef RLE_SUPPORTED /* Utah RLE image file format */
|
| -#define TARGA_SUPPORTED /* Targa image file format */
|
| +#define BMP_SUPPORTED /* BMP image file format */
|
| +#define GIF_SUPPORTED /* GIF image file format */
|
| +#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
|
| +#undef RLE_SUPPORTED /* Utah RLE image file format */
|
| +#define TARGA_SUPPORTED /* Targa image file format */
|
|
|
| -#define TWO_FILE_COMMANDLINE /* optional */
|
| -#define USE_SETMODE /* Microsoft has setmode() */
|
| +#define TWO_FILE_COMMANDLINE /* optional */
|
| +#define USE_SETMODE /* Microsoft has setmode() */
|
| #undef NEED_SIGNAL_CATCHER
|
| #undef DONT_USE_B_MODE
|
| -#undef PROGRESS_REPORT /* optional */
|
| +#undef PROGRESS_REPORT /* optional */
|
|
|
| #endif /* JPEG_CJPEG_DJPEG */
|
|
|