diff options
author | Haibo Huang <hhb@google.com> | 2020-12-29 20:32:14 -0800 |
---|---|---|
committer | Haibo Huang <hhb@google.com> | 2020-12-29 20:32:14 -0800 |
commit | 8091842bf92addd9e7f089a5a13f913c5596d502 (patch) | |
tree | 0115172c8f4ed50e1bed780b3c51c579df2d62f5 | |
parent | bbc7c083b0e2eff0cdc6247afc73a8194ba2a0a0 (diff) | |
parent | 09efc26aff7983f4377a1743a197ca3d74796d7d (diff) | |
download | libjpeg-turbo-8091842bf92addd9e7f089a5a13f913c5596d502.tar.gz |
Upgrade libjpeg-turbo to 09efc26aff7983f4377a1743a197ca3d74796d7d
Test: make
Change-Id: I81d381e5dcef8a1169021ca75ddf2cb6d505affd
-rw-r--r-- | METADATA | 4 | ||||
-rw-r--r-- | README.chromium | 2 | ||||
-rw-r--r-- | simd/arm/aarch64/jsimd.c | 3 |
3 files changed, 7 insertions, 2 deletions
@@ -5,11 +5,11 @@ third_party { type: GIT value: "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo" } - version: "e9a659a09e9600883e499c06ede04ba514d7f942" + version: "09efc26aff7983f4377a1743a197ca3d74796d7d" license_type: NOTICE last_upgrade_date { year: 2020 month: 12 - day: 9 + day: 29 } } diff --git a/README.chromium b/README.chromium index 469e550b..b0a16238 100644 --- a/README.chromium +++ b/README.chromium @@ -73,6 +73,8 @@ following changes which are not merged to upstream: - Refactor djpeg.c to provide test interface A new gtest directory contains GTest wrappers (and associated utilities) for each of tjunittest, tjbench, cjpeg, djpeg and jpegtran. +* Disable Neon SIMD path for Huffman encoding when compiling for Windows on Arm + using Clang-cl: http://crbug.com/1160249 Refer to working-with-nested-repos [1] for details of how to setup your git svn client to update the code (for making local changes, cherry picking from diff --git a/simd/arm/aarch64/jsimd.c b/simd/arm/aarch64/jsimd.c index 8570b82c..4991bc0a 100644 --- a/simd/arm/aarch64/jsimd.c +++ b/simd/arm/aarch64/jsimd.c @@ -977,6 +977,8 @@ jsimd_idct_float(j_decompress_ptr cinfo, jpeg_component_info *compptr, GLOBAL(int) jsimd_can_huff_encode_one_block(void) { +/* Disable for Windows on Arm compiled with Clang-cl: crbug.com/1160249 */ +#if !(defined(_MSC_VER) && defined(__clang__)) init_simd(); if (DCTSIZE != 8) @@ -986,6 +988,7 @@ jsimd_can_huff_encode_one_block(void) if (simd_support & JSIMD_NEON && simd_huffman) return 1; +#endif return 0; } |