From 1fc01712780361804bfa87918c03f839c157c278 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sun, 29 Dec 2013 15:09:28 -0600 Subject: [PATCH] [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 | 3 +++ CHANGES | 3 +++ contrib/libtests/pngvalid.c | 2 ++ 3 files changed, 8 insertions(+) diff --git a/ANNOUNCE b/ANNOUNCE index 393104636..b79b0764f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -51,6 +51,9 @@ Version 1.6.9beta02 [December 29, 2013] 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 diff --git a/CHANGES b/CHANGES index 2e2e03742..7abfab10f 100644 --- a/CHANGES +++ b/CHANGES @@ -4776,6 +4776,9 @@ Version 1.6.9beta02 [December 29, 2013] 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 diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index c20427d39..c4a4a26a1 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -10361,10 +10361,12 @@ int main(int argc, char **argv) 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);