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
diff --git a/README.chromium b/README.chromium
index 3b0dbf9..a595954 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,14 +1,14 @@
Name: libjpeg-turbo
URL: http://sourceforge.net/projects/libjpeg-turbo/
-Version: 1.2.80
+Version: 1.3.1
License: Custom license
License File: LICENSE.txt
Security Critical: yes
Description:
-This consists of three components:
-* A partial copy of libjpeg-turbo 1.2.80 (r856);
-* Revision r1188 cherry-picked from upstream trunk;
+This consists of the components:
+* A partial copy of libjpeg-turbo 1.3.1 (r1219);
+* Revision r1188 cherry-picked from upstream trunk into config.h;
* A build file (libjpeg.gyp), and;
* Patched header files used by Chromium.
@@ -20,11 +20,10 @@
externally visible functions to chromium_* so that we can avoid conflicts that
arise when system libraries attempt to use our libjpeg. Also, we applied the
following changes which are not merged to upstream:
+
* Added the 'private_extern' flags on Mac (or the 'hidden' flags on Linux) to
all the global symbols in '.asm' files to prevent making them external ones.
* Supported motion-JPEG frames that do not have DHT markers.
-* Fixed valgrind errors.
+
The 'google.patch' file represents our changes from the original
-libjpeg-turbo-1.2. With those applied, also patch in google.jdmarker.patch to
-better handle multiple SOS CSi values and their ordering, and to 0 unused DHT
-huffman values at creation time.
+libjpeg-turbo-1.2.