diff options
| author | noel@chromium.org <noel@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-04-14 06:56:00 +0000 |
|---|---|---|
| committer | noel@chromium.org <noel@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-04-14 06:56:00 +0000 |
| commit | 3395bcc26e390d2960d15020d4a4d27ae0c122fe (patch) | |
| tree | 70d532ca62c1eb0b3c8d44f818dc304a9a2a80ae /jconfig.h | |
| parent | 24cafe92b7a98c36a8062e1ac2fef9832588ac85 (diff) | |
Upgrade libjpeg_turbo to 1.3.1 (r1219)
Remove google.jdmarker.patch, since the fixes for CVE-2013-6629
and CVE-2013-6630 are upstream most everywhere now [1]. Version
number to 1.3.1 (config.h, jconfig.h).
README.chromium: "Fixed valgrind error" patch was upstreamed in
r839 http://sourceforge.net/p/libjpeg-turbo/code/839. The r1188
cherry-pick was put in config.h, say that.
[1] http://seclists.org/fulldisclosure/2013/Nov/83
TBR=darin@chromium.org
BUG=258723, 299835
Review URL: https://codereview.appspot.com/87110044
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@263594 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'jconfig.h')
| -rw-r--r-- | jconfig.h | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -5,7 +5,7 @@ #define JPEG_LIB_VERSION 62 /* libjpeg-turbo version */ -#define LIBJPEG_TURBO_VERSION 1.2.80 +#define LIBJPEG_TURBO_VERSION 1.3.1 /* Support arithmetic encoding */ /* #undef C_ARITH_CODING_SUPPORTED */ @@ -13,6 +13,9 @@ /* Support arithmetic decoding */ /* #undef D_ARITH_CODING_SUPPORTED */ +/* Support in-memory source/destination managers */ +/* #undef MEM_SRCDST_SUPPORTED */ + /* Define if your compiler supports prototypes */ #define HAVE_PROTOTYPES 1 |