From 0ee7a07a85e7e87a91ab969aabdc30890cadbec6 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Wed, 29 Apr 2015 11:39:12 -0500
Subject: [PATCH] [libpng17] merge pngpriv.h and pngset.c with
 libpng-1.6.18beta03.

---
 ANNOUNCE  |  6 ++++--
 CHANGES   |  4 +++-
 pngpriv.h | 10 +++++++++-
 pngset.c  |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 6177debb9..bbb6a57b8 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.7.0beta60 - April 19, 2015
+Libpng 1.7.0beta60 - April 29, 2015
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -795,7 +795,9 @@ Version 1.7.0beta59 [April 19, 2015]
   Suppressed some warnings from the Borland C++ 5.5.1/5.82 compiler
     (Bug report by Viktor Szaka'ts).
 
-Version 1.7.0beta60 [April 19, 2015]
+Version 1.7.0beta60 [April 29, 2015]
+  Replaced "unexpected" with an integer (0xabadca11) in pngset.c
+    where a long was expected, to avoid a compiler warning when PNG_DEBUG > 1.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index bf43226ff..76a1e2ca2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5085,7 +5085,9 @@ Version 1.7.0beta59 [April 19, 2015]
   Suppressed some warnings from the Borland C++ 5.5.1/5.82 compiler
     (Bug report by Viktor Szaka'ts).
 
-Version 1.7.0beta60 [April 19, 2015]
+Version 1.7.0beta60 [April 29, 2015]
+  Replaced "unexpected" with an integer (0xabadca11) in pngset.c
+    where a long was expected, to avoid a compiler warning when PNG_DEBUG > 1.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngpriv.h b/pngpriv.h
index 9f87c8c99..1b94551f2 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -154,8 +154,16 @@
     * PNG_ARM_NEON_OPT is set in CPPFLAGS (to >0) then arm/arm_init.c will fail
     * to compile with an appropriate #error if ALIGNED_MEMORY has been turned
     * off.
+    *
+    * Note that gcc-4.9 defines __ARM_NEON instead of the deprecated
+    * __ARM_NEON__, so we check both variants.
+    *
+    * To disable ARM_NEON optimizations entirely, and skip compiling the
+    * associated assembler code, pass --enable-arm-neon=no to configure
+    * or put -DPNG_ARM_NEON_OPT=0 in CPPFLAGS.
     */
-#  if defined(__ARM_NEON__) && defined(PNG_ALIGNED_MEMORY_SUPPORTED)
+#  if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \
+   defined(PNG_ALIGNED_MEMORY_SUPPORTED)
 #     define PNG_ARM_NEON_OPT 2
 #  else
 #     define PNG_ARM_NEON_OPT 0
diff --git a/pngset.c b/pngset.c
index 23ee20829..91448ee99 100644
--- a/pngset.c
+++ b/pngset.c
@@ -713,7 +713,7 @@ png_set_text_2(png_structrp png_ptr, png_inforp info_ptr,
 {
    int i;
 
-   png_debug1(1, "in %lx storage function", png_ptr == NULL ? "unexpected" :
+   png_debug1(1, "in %lx storage function", png_ptr == NULL ? 0xabadca11 :
       (unsigned long)png_ptr->chunk_name);
 
    if (png_ptr == NULL || info_ptr == NULL || num_text <= 0 || text_ptr == NULL)