summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Clegg <sbc@chromium.org>2015-04-15 10:53:07 -0700
committerSam Clegg <sbc@chromium.org>2015-04-15 10:53:07 -0700
commitb3300162a1ebacc973ff9793029caf4db9a4f5e5 (patch)
tree0044d8ef7b8752991625f886ae65c7a25d77e25f
parentff05471b7bf9fbfeaebb3fb59468228f8cf84c63 (diff)
downloadpdfium-chromium/2376.tar.xz
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
-rw-r--r--AUTHORS3
-rw-r--r--samples/fx_lpng/lpng_v163/pngpriv.h6
2 files changed, 8 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index cb225abfd2..c57cb51092 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@ Brett Wilson <brettw@chromium.org>
Bruce Dawson <brucedawson@chromium.org>
Chris Palmer <palmer@chromium.org>
Finnur Thorarinsson <finnur@chromium.org>
+Jiang Jiang <jiangj@opera.com>
Jochen Eisinger <jochen@chromium.org>
John Abd-El-Malek <jam@chromium.org>
Julien Tinnes <jln@chromium.org>
@@ -26,8 +27,8 @@ Peter Kasting <pkasting@chromium.org>
Raymes Khoury <raymes@chromium.org>
Reid Kleckner <rnk@chromium.org>
Robert Sesek <rsesek@chromium.org>
+Sam Clegg <sbc@chromium.org>
Thomas Sepez <tsepez@chromium.org>
-Jiang Jiang <jiangj@opera.com>
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