commit 1fc01712780361804bfa87918c03f839c157c278
author John Bowler <jbowler@acm.org> Sun Dec 29 15:09:28 2013 -0600
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Sun Dec 29 15:09:28 2013 -0600
tree 9356d96c83a06b694ed4349feda14083020cbf4f
parent a8472470a4dd70ee5732da1344c324b3f2a9c5c0

[libpng16] Revised pngvalid.c to support libpng 1.5, which does not support the

PNG_MAXIMUM_INFLATE_WINDOW option, so #define it out when appropriate in
pngvalid.c

ANNOUNCE

diff --git a/ANNOUNCE b/ANNOUNCE
index 3931046..b79b076 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -51,6 +51,9 @@
   Merged pngrio.c, pngtrans.c, pngwio.c, and pngerror.c with libpng-1.7.0
   Merged libpng-1.7.0 changes to make no-interlace configurations work
     with test programs.
+  Revised pngvalid.c to support libpng 1.5, which does not support the
+    PNG_MAXIMUM_INFLATE_WINDOW option, so #define it out when appropriate in
+    pngvalid.c
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

CHANGES

diff --git a/CHANGES b/CHANGES
index 2e2e037..7abfab1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4776,6 +4776,9 @@
   Merged pngrio.c, pngtrans.c, pngwio.c, and pngerror.c with libpng-1.7.0
   Merged libpng-1.7.0 changes to make no-interlace configurations work
     with test programs.
+  Revised pngvalid.c to support libpng 1.5, which does not support the
+    PNG_MAXIMUM_INFLATE_WINDOW option, so #define it out when appropriate in
+    pngvalid.c
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

contrib/libtests/pngvalid.c

diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c
index c20427d..c4a4a26 100644
--- a/contrib/libtests/pngvalid.c
+++ b/contrib/libtests/pngvalid.c
@@ -10361,10 +10361,12 @@
 
          else
 #endif
+#ifdef PNG_MAXIMUM_INFLATE_WINDOW
          if (strncmp(arg, "max-inflate-window:", 19) == 0)
             option = PNG_MAXIMUM_INFLATE_WINDOW, arg += 19;
 
          else
+#endif
          {
             fprintf(stderr, "pngvalid: %s: %s: unknown option\n", *argv, arg);
             exit(99);