diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 21:06:47 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 21:06:47 +0200 |
| commit | 42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4 (patch) | |
| tree | a7f25b1d335a834a7c3ae104cee913ef3a4dd4fb /src/3rdparty/libjpeg/src/jconfig.h | |
| parent | 4ee4fc18b4067b90efa46ca9baba74f53b54d9ec (diff) | |
| parent | 168ff3419f256fdb35b586275d293fc0cd773fe1 (diff) | |
| download | qtbase-42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4.tar.gz | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl5.15
Change-Id: Iaff6b55275e50d19973e1020853d8622587069f9
Diffstat (limited to 'src/3rdparty/libjpeg/src/jconfig.h')
| -rw-r--r-- | src/3rdparty/libjpeg/src/jconfig.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/3rdparty/libjpeg/src/jconfig.h b/src/3rdparty/libjpeg/src/jconfig.h index 17b9137e3e..7982724a26 100644 --- a/src/3rdparty/libjpeg/src/jconfig.h +++ b/src/3rdparty/libjpeg/src/jconfig.h @@ -2,9 +2,9 @@ #define JPEG_LIB_VERSION 80 -#define LIBJPEG_TURBO_VERSION 2.1.1 +#define LIBJPEG_TURBO_VERSION 2.1.3 -#define LIBJPEG_TURBO_VERSION_NUMBER 2001001 +#define LIBJPEG_TURBO_VERSION_NUMBER 2001003 #define C_ARITH_CODING_SUPPORTED 1 @@ -14,10 +14,4 @@ #define BITS_IN_JSAMPLE 8 -#define HAVE_STDDEF_H 1 - -#define HAVE_STDLIB_H 1 - -#define HAVE_UNSIGNED_CHAR 1 - -#define HAVE_UNSIGNED_SHORT 1 +#define NO_PUTENV |