From 4da61d8d3d8ad82e8799668128a5d05fa6ff3296 Mon Sep 17 00:00:00 2001 From: James Zern Date: Sat, 24 Jul 2021 14:57:33 -0700 Subject: update to v1.2.1 Just a small bug fix release; some overflow fixes related to cropping/scaling are relevant for skia. - 7/20/2021: version 1.2.1 This is a binary compatible release. * minor lossless encoder improvements and x86 color conversion speed up * add ARM64 simulator support to xcframeworkbuild.sh (#510) * further security related hardening in libwebp & examples (issues: #497, #508, #518) (chromium: #1196480, #1196773, #1196775, #1196777, #1196778, #1196850) (oss-fuzz: #28658, #28978) * toolchain updates and bug fixes (#498, #501, #502, #504, #505, #506, #509, #533) * use more inclusive language within the source (#507) Bug: 188435220 Test: sargo_hwasan arm64/armv7 CtsGraphicsTestCases:include-filter:android.graphics.cts.Bitmap* Test: sargo_hwasan arm64/armv7 CtsGraphicsTestCases:include-filter:android.graphics.cts.*ImageDecoder* Test: builds for aosp_arm-eng aosp_arm64-eng aosp_x86-eng aosp_x86_64-eng aosp_crosshatch-userdebug Change-Id: I01bf93885447fdba1bc8f3874eb35869423e39b1 --- src/dsp/cpu.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/dsp/cpu.c') diff --git a/src/dsp/cpu.c b/src/dsp/cpu.c index 4ca90d88..3145e190 100644 --- a/src/dsp/cpu.c +++ b/src/dsp/cpu.c @@ -189,17 +189,17 @@ VP8CPUInfo VP8GetCPUInfo = AndroidCPUInfo; // Use compile flags as an indicator of SIMD support instead of a runtime check. static int wasmCPUInfo(CPUFeature feature) { switch (feature) { -#ifdef WEBP_USE_SSE2 +#ifdef WEBP_HAVE_SSE2 case kSSE2: return 1; #endif -#ifdef WEBP_USE_SSE41 +#ifdef WEBP_HAVE_SSE41 case kSSE3: case kSlowSSSE3: case kSSE4_1: return 1; #endif -#ifdef WEBP_USE_NEON +#ifdef WEBP_HAVE_NEON case kNEON: return 1; #endif @@ -209,9 +209,10 @@ static int wasmCPUInfo(CPUFeature feature) { return 0; } VP8CPUInfo VP8GetCPUInfo = wasmCPUInfo; -#elif defined(WEBP_USE_NEON) -// define a dummy function to enable turning off NEON at runtime by setting -// VP8DecGetCPUInfo = NULL +#elif defined(WEBP_HAVE_NEON) +// In most cases this function doesn't check for NEON support (it's assumed by +// the configuration), but enables turning off NEON at runtime, for testing +// purposes, by setting VP8DecGetCPUInfo = NULL. static int armCPUInfo(CPUFeature feature) { if (feature != kNEON) return 0; #if defined(__linux__) && defined(WEBP_HAVE_NEON_RTCD) -- cgit v1.2.3