diff options
| author | Haibo Huang <hhb@google.com> | 2021-01-06 15:22:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-06 15:22:14 +0000 |
| commit | 3bd8f29b22cd8258f403ac68a715a81c60ec5e08 (patch) | |
| tree | 0115172c8f4ed50e1bed780b3c51c579df2d62f5 /simd/arm/aarch64/jsimd.c | |
| parent | a5fac4b8fe9194099b852d9ab1b96ae6961c36b6 (diff) | |
| parent | 8091842bf92addd9e7f089a5a13f913c5596d502 (diff) | |
Upgrade libjpeg-turbo to 09efc26aff7983f4377a1743a197ca3d74796d7d am: 8091842bf9
Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1534067
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4aebdc3d8a8e03fdf65f26732331bb5cb8b42924
Diffstat (limited to 'simd/arm/aarch64/jsimd.c')
| -rw-r--r-- | simd/arm/aarch64/jsimd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/simd/arm/aarch64/jsimd.c b/simd/arm/aarch64/jsimd.c index 8570b82..4991bc0 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; } |