diff options
| author | aavit <qt-info@nokia.com> | 2010-02-05 13:45:51 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-02-16 15:41:14 (GMT) |
| commit | 6942ee49314b9619ac21acfde165124ac2a36f80 (patch) | |
| tree | 9d15f9761f622db64c410a841b301e7f0049f2f5 | |
| parent | 1b8c5a9431f34cc9188d39a9c39873a1e94bba6b (diff) | |
| download | Qt-6942ee49314b9619ac21acfde165124ac2a36f80.zip Qt-6942ee49314b9619ac21acfde165124ac2a36f80.tar.gz Qt-6942ee49314b9619ac21acfde165124ac2a36f80.tar.bz2 | |
Our configuration and build modifications to libjpeg
This commit is the combination of earlier Qt patches to libpng,
reapplied here after the upgrade to version 8.
| -rw-r--r-- | src/3rdparty/libjpeg/jconfig.h | 46 | ||||
| -rw-r--r-- | src/3rdparty/libjpeg/jmorecfg.h | 9 |
2 files changed, 53 insertions, 2 deletions
diff --git a/src/3rdparty/libjpeg/jconfig.h b/src/3rdparty/libjpeg/jconfig.h new file mode 100644 index 0000000..7e10d1b --- /dev/null +++ b/src/3rdparty/libjpeg/jconfig.h @@ -0,0 +1,46 @@ +/* see jconfig.txt for explanations */ + +#define HAVE_PROTOTYPES +#define HAVE_UNSIGNED_CHAR +#define HAVE_UNSIGNED_SHORT +/* #define void char */ +/* #define const */ +#undef CHAR_IS_UNSIGNED +#define HAVE_STDDEF_H +#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_SHORT_EXTERNAL_NAMES +#undef INCOMPLETE_TYPES_BROKEN + +#if defined(_WIN32) +/* Define "boolean" as unsigned char, not int, per Windows custom */ +#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 */ +#endif + + +#ifdef JPEG_INTERNALS + +#undef RIGHT_SHIFT_IS_UNSIGNED + +#endif /* JPEG_INTERNALS */ + +#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 TWO_FILE_COMMANDLINE /* optional */ +#define USE_SETMODE /* Microsoft has setmode() */ +#undef NEED_SIGNAL_CATCHER +#undef DONT_USE_B_MODE +#undef PROGRESS_REPORT /* optional */ + +#endif /* JPEG_CJPEG_DJPEG */ diff --git a/src/3rdparty/libjpeg/jmorecfg.h b/src/3rdparty/libjpeg/jmorecfg.h index 928d052..4c56cf3 100644 --- a/src/3rdparty/libjpeg/jmorecfg.h +++ b/src/3rdparty/libjpeg/jmorecfg.h @@ -162,11 +162,13 @@ typedef short INT16; #ifndef _BASETSD_H_ /* Microsoft defines it in basetsd.h */ #ifndef _BASETSD_H /* MinGW is slightly different */ #ifndef QGLOBAL_H /* Qt defines it in qglobal.h */ +#ifndef VXWORKS typedef long INT32; #endif #endif #endif #endif +#endif /* Datatype used for image dimensions. The JPEG standard only supports * images up to 64K*64K due to 16-bit fields in SOF markers. Therefore @@ -187,6 +189,9 @@ typedef unsigned int JDIMENSION; * or code profilers that require it. */ +#if defined(VXWORKS) && defined(LOCAL) +#undef LOCAL +#endif /* a function called through method pointers: */ #define METHODDEF(type) static type /* a function used only in its module: */ @@ -273,7 +278,7 @@ typedef int boolean; /* Encoder capability options: */ -#define C_ARITH_CODING_SUPPORTED /* Arithmetic coding back end? */ +#undef C_ARITH_CODING_SUPPORTED /* Arithmetic coding back end? */ #define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */ #define C_PROGRESSIVE_SUPPORTED /* Progressive JPEG? (Requires MULTISCAN)*/ #define DCT_SCALING_SUPPORTED /* Input rescaling via DCT? (Requires DCT_ISLOW)*/ @@ -290,7 +295,7 @@ typedef int boolean; /* Decoder capability options: */ -#define D_ARITH_CODING_SUPPORTED /* Arithmetic coding back end? */ +#undef D_ARITH_CODING_SUPPORTED /* Arithmetic coding back end? */ #define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */ #define D_PROGRESSIVE_SUPPORTED /* Progressive JPEG? (Requires MULTISCAN)*/ #define IDCT_SCALING_SUPPORTED /* Output rescaling via IDCT? */ |