[libpng15] Imported from libpng-1.5.15beta08.tar
diff --git a/LICENSE b/LICENSE
index 57cad6b..afe2f31 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.5.15beta08, February 27, 2013, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.15beta08, March 4, 2013, are
Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
@@ -108,4 +108,4 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-February 27, 2013
+March 4, 2013
diff --git a/Makefile.in b/Makefile.in
index bc1c954..bea892a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1526,7 +1526,7 @@
rm -f $@ dfn?.out
test -z "$(CPPFLAGS)"
echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\
- $(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out logunsupported=1
+ $(AWK) -f ${srcdir}/scripts/options.awk out=dfn1.out logunsupported=1\
version=search ${srcdir}/pngconf.h -\
${srcdir}/scripts/pnglibconf.dfa 1>&2
$(AWK) -f ${srcdir}/scripts/options.awk out=dfn2.out dfn1.out 1>&2
diff --git a/README b/README
index 71f46f7..1733525 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.5.15beta08 - February 27, 2013 (shared library 15.0)
+README for libpng version 1.5.15beta08 - March 4, 2013 (shared library 15.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
diff --git a/config.h.in b/config.h.in
index 8905c19..cad335d 100644
--- a/config.h.in
+++ b/config.h.in
@@ -73,14 +73,17 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Align row buffers */
-#undef PNG_ALIGNED_MEMORY_SUPPORTED
+/* Turn on ARM Neon optimizations at run-time */
+#undef PNG_ARM_NEON_API_SUPPORTED
-/* ARM NEON filter initialization function */
-#undef PNG_FILTER_OPTIMIZATIONS
+/* Check for ARM Neon support at run-time */
+#undef PNG_ARM_NEON_CHECK_SUPPORTED
-/* Turn off run-time checking for ARM NEON support */
-#undef PNG_NO_ARM_NEON_CHECK
+/* Enable ARM Neon optimizations */
+#undef PNG_ARM_NEON_SUPPORTED
+
+/* Disable ARM Neon optimizations */
+#undef PNG_NO_ARM_NEON
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff --git a/configure b/configure
index 1c6ac86..14b26c3 100755
--- a/configure
+++ b/configure
@@ -1435,8 +1435,13 @@
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
- --enable-arm-neon Enable ARM NEON optimizations: use 'always' to turn
- off run-time checks
+ --enable-arm-neon Enable ARM NEON optimizations: =off, check, api, on:
+ off: disable the optimizations; check: use internal
+ checking code (deprecated and poorly supported);
+ api: disable by default, enable by a call to
+ png_set_option; on: turn on unconditionally. The
+ default is 'on' if __ARM_NEON__ is defined,
+ otherwise 'off'.
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -12812,19 +12817,26 @@
# Check whether --enable-arm-neon was given.
if test "${enable_arm_neon+set}" = set; then :
- enableval=$enable_arm_neon; if test "${enableval}" = "yes" -o "${enableval}" = "always"; then
+ enableval=$enable_arm_neon; case "$enableval" in
+ off)
-$as_echo "#define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon" >>confdefs.h
+$as_echo "#define PNG_NO_ARM_NEON /**/" >>confdefs.h
+;;
+ check)
+$as_echo "#define PNG_ARM_NEON_CHECK_SUPPORTED /**/" >>confdefs.h
+;;
+ api)
-$as_echo "#define PNG_ALIGNED_MEMORY_SUPPORTED 1" >>confdefs.h
+$as_echo "#define PNG_ARM_NEON_API_SUPPORTED /**/" >>confdefs.h
+;;
+ on)
- if test "${enableval}" = "always"; then
-
-$as_echo "#define PNG_NO_ARM_NEON_CHECK /**/" >>confdefs.h
-
- fi
- fi
+$as_echo "#define PNG_ARM_NEON_SUPPORTED /**/" >>confdefs.h
+;;
+ *)
+ as_fn_error $? "arm-neon: option value required (off/check/api/on)" "$LINENO" 5;;
+ esac
fi
if test "${enable_arm_neon:-no}" != "no"; then
diff --git a/configure.ac b/configure.ac
index 07487ba..e134c15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,18 +173,27 @@
AC_ARG_ENABLE([arm-neon],
AS_HELP_STRING([[[--enable-arm-neon]]],
- [Enable ARM NEON optimizations: use 'always' to turn off run-time checks]),
- [if test "${enableval}" = "yes" -o "${enableval}" = "always"; then
- AC_DEFINE([PNG_FILTER_OPTIMIZATIONS],
- [png_init_filter_functions_neon],
- [ARM NEON filter initialization function])
- AC_DEFINE([PNG_ALIGNED_MEMORY_SUPPORTED], [],
- [Align row buffers])
- if test "${enableval}" = "always"; then
- AC_DEFINE([PNG_NO_ARM_NEON_CHECK], [],
- [Turn off run-time checking for ARM NEON support])
- fi
- fi])
+ [Enable ARM NEON optimizations: =off, check, api, on:]
+ [off: disable the optimizations; check: use internal checking code]
+ [(deprecated and poorly supported); api: disable by default, enable by]
+ [a call to png_set_option; on: turn on unconditionally. The]
+ [default is 'on' if __ARM_NEON__ is defined, otherwise 'off'.]),
+ [case "$enableval" in
+ off)
+ AC_DEFINE([PNG_NO_ARM_NEON], [],
+ [Disable ARM Neon optimizations]);;
+ check)
+ AC_DEFINE([PNG_ARM_NEON_CHECK_SUPPORTED], [],
+ [Check for ARM Neon support at run-time]);;
+ api)
+ AC_DEFINE([PNG_ARM_NEON_API_SUPPORTED], [],
+ [Turn on ARM Neon optimizations at run-time]);;
+ on)
+ AC_DEFINE([PNG_ARM_NEON_SUPPORTED], [],
+ [Enable ARM Neon optimizations]);;
+ *)
+ AC_MSG_ERROR([arm-neon: option value required (off/check/api/on)]);;
+ esac])
AM_CONDITIONAL([PNG_ARM_NEON], [test "${enable_arm_neon:-no}" != "no"])
AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]])
diff --git a/libpngpf.3 b/libpngpf.3
index 239d4d5..c957fe9 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "February 27, 2013"
+.TH LIBPNGPF 3 "March 4, 2013"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.15beta08
(private functions)
diff --git a/png.5 b/png.5
index 117e53b..12df1ba 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "February 27, 2013"
+.TH PNG 5 "March 4, 2013"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/pngconf.h b/pngconf.h
index a576c5b..267fc92 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.5.15beta08 - February 27, 2013
+ * libpng version 1.5.15beta08 - March 4, 2013
*
* Copyright (c) 1998-2013 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 99943b0..c595a6a 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.5.15beta08 - February 27, 2013
+libpng version 1.5.15beta08 - March 4, 2013
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 650a8a3..579de34 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.5.15beta08 - February 27, 2013
+ * libpng version 1.5.15beta08 - March 4, 2013
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index ddb594e..99dbf5e 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.5.15beta08 - February 27, 2013
+Makefiles for libpng version 1.5.15beta08 - March 4, 2013
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
