From b3300162a1ebacc973ff9793029caf4db9a4f5e5 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Wed, 15 Apr 2015 10:53:07 -0700 Subject: Don't use NEON optimized code in lpng_v163 The source files required to use the NEON function are not included so we should not try to reference those symbols. BUG=477162 TEST=ninja -C out_arm/Release/ pdfium_diff R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1085023003 --- AUTHORS | 3 ++- samples/fx_lpng/lpng_v163/pngpriv.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index cb225abfd2..c57cb51092 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,6 +13,7 @@ Brett Wilson Bruce Dawson Chris Palmer Finnur Thorarinsson +Jiang Jiang Jochen Eisinger John Abd-El-Malek Julien Tinnes @@ -26,8 +27,8 @@ Peter Kasting Raymes Khoury Reid Kleckner Robert Sesek +Sam Clegg Thomas Sepez -Jiang Jiang Foxit Software Inc <*@foxitsoftware.com> Google Inc. <*@google.com> diff --git a/samples/fx_lpng/lpng_v163/pngpriv.h b/samples/fx_lpng/lpng_v163/pngpriv.h index 7fa3d6059c..18965380c8 100644 --- a/samples/fx_lpng/lpng_v163/pngpriv.h +++ b/samples/fx_lpng/lpng_v163/pngpriv.h @@ -107,6 +107,11 @@ * this in $(CC), e.g. "CC=gcc -mfpu=neon", but people who build libpng rarely * do this. */ +/* + * pdfium: This version of libpng does not contain the arm neon optimized code + * so we should never try to reference it. + */ +#if 0 #ifndef PNG_ARM_NEON_OPT /* ARM NEON optimizations are being controlled by the compiler settings, * typically the target FPU. If the FPU has been set to NEON (-mfpu=neon @@ -127,6 +132,7 @@ */ # define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon #endif +#endif /* Is this a build of a DLL where compilation of the object modules requires * different preprocessor settings to those required for a simple library? If -- cgit v1.2.3