diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-05-11 03:46:13 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-05-11 17:10:33 +0000 |
| commit | 867aa217e6bcb543ea61c61f10088042d632bd07 (patch) | |
| tree | b30feb163f2144e3d8fd0d5a57a8523fdc401367 /external | |
| parent | 1a4d24b3a430ed7f75e76e64fb0e22d05a1fad0d (diff) | |
upgrade to jpeg-9a
Includes some type conversion fixes.
Change-Id: I84f886e9f922acd780d46baea97f2d87c5ac700b
Reviewed-on: https://gerrit.libreoffice.org/9306
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'external')
| -rw-r--r-- | external/jpeg/configs/jconfig.h | 14 | ||||
| -rw-r--r-- | external/jpeg/patches/jpeg-8c-jmorecfg.patch | 21 |
2 files changed, 15 insertions, 20 deletions
diff --git a/external/jpeg/configs/jconfig.h b/external/jpeg/configs/jconfig.h index 7ea8f50d47ce..0c430518c0e4 100644 --- a/external/jpeg/configs/jconfig.h +++ b/external/jpeg/configs/jconfig.h @@ -18,12 +18,18 @@ /* Define this if you get warnings about undefined structures. */ /* #undef INCOMPLETE_TYPES_BROKEN */ -/* Define "boolean" as unsigned char, not int, on Windows systems. */ -#ifdef WNT -#ifndef __RPCNDR_H__/* don't conflict if rpcndr.h already read */ +/* Define "boolean" as unsigned char, not enum, on Windows systems. */ +#ifdef _WIN32 +#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 */ +#ifndef FALSE /* in case these macros already exist */ +#define FALSE 0 /* values of boolean */ +#endif +#ifndef TRUE +#define TRUE 1 +#endif +#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ #endif #ifdef JPEG_INTERNALS diff --git a/external/jpeg/patches/jpeg-8c-jmorecfg.patch b/external/jpeg/patches/jpeg-8c-jmorecfg.patch index 34437440220f..eed791fae9a0 100644 --- a/external/jpeg/patches/jpeg-8c-jmorecfg.patch +++ b/external/jpeg/patches/jpeg-8c-jmorecfg.patch @@ -1,25 +1,14 @@ ---- misc/jpeg-8c/jmorecfg.h 2009-11-20 09:01:24.000000000 +0100 -+++ misc/build/jpeg-8c/jmorecfg.h 2011-03-24 21:29:02.073761750 +0100 -@@ -21,7 +21,7 @@ - * We do not support run-time selection of data precision, sorry. - */ - --#define BITS_IN_JSAMPLE 8 /* use 8 or 12 */ -+#define BITS_IN_JSAMPLE 8 /* use 8 or 12 */ - - - /* -@@ -158,7 +158,8 @@ - +--- misc/jpeg-9a/jmorecfg.h 2009-11-20 09:01:24.000000000 +0100 ++++ misc/build/jpeg-9a/jmorecfg.h 2011-03-24 21:29:02.073761750 +0100 +@@ -210,6 +210,7 @@ /* INT32 must hold at least signed 32-bit values. */ --#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ -+#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ + #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ +#ifndef _SOLAR_H #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 */ -@@ -166,6 +167,7 @@ +@@ -217,6 +218,7 @@ #endif #endif #endif |