diff options
Diffstat (limited to 'chromium/third_party/libjpeg_turbo/README.chromium')
| -rw-r--r-- | chromium/third_party/libjpeg_turbo/README.chromium | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/chromium/third_party/libjpeg_turbo/README.chromium b/chromium/third_party/libjpeg_turbo/README.chromium index c8079ca82c4..b01cb0a640d 100644 --- a/chromium/third_party/libjpeg_turbo/README.chromium +++ b/chromium/third_party/libjpeg_turbo/README.chromium @@ -1,13 +1,15 @@ 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); +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; +* Revision r1220 cherry-picked from upstream trunk into jchuff.c; * A build file (libjpeg.gyp), and; * Patched header files used by Chromium. @@ -19,11 +21,10 @@ jpeglibmangler.h and included it from jpeglib.h that changes the names of all 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. |