From 7692b9d16463734fdd42e18ebd07c5ef30162f15 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Thu, 14 Jan 2016 15:53:48 -0800 Subject: Disable use of missing arm neon function in libpng This was causing pdfium_diff to fail to link on ARM/linux due to missing neon-specifc symbols. Ideally we could add the missing symbols (and update the latest version of libpng), but that can happen in a separate CL. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1585403003 . --- third_party/lpng_v163/pngpriv.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/third_party/lpng_v163/pngpriv.h b/third_party/lpng_v163/pngpriv.h index 7fa3d6059c..4ef3b189e7 100644 --- a/third_party/lpng_v163/pngpriv.h +++ b/third_party/lpng_v163/pngpriv.h @@ -125,7 +125,11 @@ /* NEON optimizations are to be at least considered by libpng, so enable the * callbacks to do this. */ -# define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon +/* + * Disabled by sbc since this copy of libpng doesn't contains the arm + * specific code (e.g. arm/arm_init.c) + */ +/*# define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon*/ #endif /* Is this a build of a DLL where compilation of the object modules requires -- cgit v1.2.3