Update libjpeg-turbo to stable release 2.1.0
Update Chromium's copy of libjpeg-turbo to the latest upstream stable
release (v2.1.0) and re-apply our local changes documented in
README.chromium.
This upstream release fixes a long-standing libjpeg6b compatability
issue[1] meaning we can dispense with the locally-applied workaround.
[1] http://crbug.com/398235
Change-Id: Icae6741f49d4ae8bc12ccfcbef416fb6a6fa16f1
diff --git a/README.chromium b/README.chromium
index e8b0bc6..d260cb2 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
Name: libjpeg-turbo
URL: https://github.com/libjpeg-turbo/libjpeg-turbo/
-Version: 2.0.90 (2.1 Beta 1)
+Version: 2.1.0
License: Custom license
License File: LICENSE.md
Security Critical: yes
@@ -8,23 +8,18 @@
Description:
This consists of the components:
-* libjpeg-turbo 2.0.90 (2.1 Beta 1)
+* libjpeg-turbo 2.1.0
* This file (README.chromium)
* A build file (BUILD.gn)
* An OWNERS file
* A codereview.settings file
* Patched header files used by Chromium
-* Additional patches cherry-picked from upstream master to fix various bugs:
- https://github.com/libjpeg-turbo/libjpeg-turbo/commit/ccaba5d7894ecfb5a8f11e48d3f86e1f14d5a469
- https://github.com/libjpeg-turbo/libjpeg-turbo/commit/c7ca521bc85b57d41d3ad4963c13fc0100481084
- https://github.com/libjpeg-turbo/libjpeg-turbo/commit/110d8d6dcafaed517e8f77a6253169535ee3a20e
- https://github.com/libjpeg-turbo/libjpeg-turbo/commit/d2c407995992be1f128704ae2479adfd7906c158
- https://github.com/libjpeg-turbo/libjpeg-turbo/commit/74e6ea45e3547ae85cd43efcdfc24a6907a2154e
-* Deleted unused directories: ci, cmakescripts, doc, java, release, sharedlib,
- simd/loongson, simd/mips, simd/powerpc, and win
+* Deleted unused directories: cmakescripts, doc, fuzz, java, release,
+ sharedlib, simd/loongson, simd/mips, simd/powerpc, and win
* Deleted unused files: appveyor.yml, CMakeLists.txt, doxygen.config,
- doxygen-extra.css, .gitattributes, tjexample.c, tjexampletest.in,
- tjexampletest.java.in, .travis.yml
+ doxygen-extra.css, .gitattributes, md5/CMakeLists.txt, md5/md5cmp.c,
+ simd/CMakeLists.txt, tjexample.c, tjexampletest.in, tjexampletest.java.in and
+ .travis.yml
* Deleted legacy Arm Neon assembly files (supporting old compiler versions that
do not generate performant code from intrinsics):
simd/arm/aarch32/jsimd_neon.S, simd/arm/aarch64/jsimd_neon.S.
@@ -38,13 +33,6 @@
arise when system libraries attempt to use our libjpeg. Also, we applied the
following changes which are not merged to upstream:
-* Fix libjpeg_turbo svn r64 libjpeg6b compat issue: make the fast path Huffman
- decoder fallback to slow decoding if the Huffman decoding bit sentinel > 16,
- this to match the exact behavior of jpeg_huff_decode().
- http://crbug.com/398235
- The patch in the above bug removed "& 0xFF". It has been restored from
- upstream:
- https://github.com/libjpeg-turbo/libjpeg-turbo/commit/fa1d18385d904d530b4aec83ab7757a33397de6e
* Configuration files jconfig.h, jconfigint.h and neon-compat.h were generated
and then altered manually to be compatible on all of Chromium's platforms.
http://crbug.com/608347