summaryrefslogtreecommitdiff
path: root/scripts/pnglibconf.dfa
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@acm.org>2013-02-19 10:20:06 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2013-02-19 10:20:59 -0600
commitd19ad72e2828707b3fb53795605bac4cf32e3d86 (patch)
tree4e27ce9512a7d186ad535028400bbf96d018542e /scripts/pnglibconf.dfa
parent1b69de718ea8664805a6e3d7bba65fa0213178e0 (diff)
downloadlibpng-d19ad72e2828707b3fb53795605bac4cf32e3d86.tar.gz
[libpng15] Fixed PNG_ALIGN(ED)_MEMORY and add ability to turn off ARM_NEON
runtime checks
Diffstat (limited to 'scripts/pnglibconf.dfa')
-rw-r--r--scripts/pnglibconf.dfa20
1 files changed, 19 insertions, 1 deletions
diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa
index 3c30223da..62764e03b 100644
--- a/scripts/pnglibconf.dfa
+++ b/scripts/pnglibconf.dfa
@@ -127,6 +127,12 @@ logunsupported = 1
# - PNG_USER_VERSIONINFO_COMPANYNAME
# - PNG_USER_VERSIONINFO_LEGALTRADEMARKS
+# It is necessary to include configures definitions here so that AC_DEFINE
+# in configure.ac works in a comprehensible way
+@#if defined(HAVE_CONFIG_H) && !defined(PNG_NO_CONFIG_H)
+@# include "config.h"
+@#endif
+
@#ifdef PNG_USER_CONFIG
@# include "pngusr.h"
@#endif
@@ -179,6 +185,18 @@ option READ_INT_FUNCTIONS requires READ
option WRITE_INT_FUNCTIONS disabled
option WRITE enables WRITE_INT_FUNCTIONS
+# This setting allows a hardware or configuration specific filter optimization
+# function to be specified, the argument is the name of the filter initializaion
+# function to use.
+
+setting FILTER_OPTIMIZATIONS
+
+# This option turns on runtime checks for ARM NEON support, it is irrelevant
+# on other platforms and it is irrelevant unless NEON code is turned on. Checks
+# are on by default
+
+option ARM_NEON_CHECK
+
# Generic options - affect both read and write.
option WARNINGS
@@ -446,7 +464,7 @@ option CHECK_cHRM requires cHRM
# but can help (in theory) on some architectures. Only affects
# internal structures. Added at libpng 1.4.0
-option ALIGN_MEMORY
+option ALIGNED_MEMORY
# Buggy compilers (e.g., gcc 2.7.2.2) need PNG_NO_POINTER_INDEXING
# See png[wr]util.c, normally this should always be *on*