From 665949a3ecf1fbe188a8387aa9a3db99432f82ec Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Tue, 26 Jun 2018 10:49:42 -0400 Subject: Update libjpeg-turbo to pre-2.0.0 (from 1.5.3) jpeg_skip_scanlines was incorrectly incrementing an internal counter, resulting in an infinite loop. (This only occurs for certain types of progressive images, using certain sample sizes.) The fix is at https://github.com/libjpeg-turbo/libjpeg-turbo/commit/26f109290dc4ffc9c522d9f5d5a7d5d1ee2c0e0a. This is included in tip-of-tree, which is unofficially 2.0.0, so go ahead and update to it. Add a test based on the original bug. Bug: b/78329453 Change-Id: I5ade9924812324d58668c26f71cd622ef93f40a7 Reviewed-on: https://skia-review.googlesource.com/129459 Commit-Queue: Leon Scroggins Reviewed-by: Mike Klein --- third_party/libjpeg-turbo/BUILD.gn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'third_party') diff --git a/third_party/libjpeg-turbo/BUILD.gn b/third_party/libjpeg-turbo/BUILD.gn index 66e10955d5..1f9b486637 100644 --- a/third_party/libjpeg-turbo/BUILD.gn +++ b/third_party/libjpeg-turbo/BUILD.gn @@ -72,13 +72,13 @@ if (skia_use_system_libjpeg_turbo) { if (current_cpu == "arm" && !is_ios) { sources += [ - "../externals/libjpeg-turbo/simd/jsimd_arm.c", - "../externals/libjpeg-turbo/simd/jsimd_arm_neon.S", + "../externals/libjpeg-turbo/simd/arm/jsimd.c", + "../externals/libjpeg-turbo/simd/arm/jsimd_neon.S", ] } else if (current_cpu == "arm64" && !is_ios) { sources += [ - "../externals/libjpeg-turbo/simd/jsimd_arm64.c", - "../externals/libjpeg-turbo/simd/jsimd_arm64_neon.S", + "../externals/libjpeg-turbo/simd/arm64/jsimd.c", + "../externals/libjpeg-turbo/simd/arm64/jsimd_neon.S", ] } else { sources += [ "../externals/libjpeg-turbo/jsimd_none.c" ] -- cgit v1.2.3