From 714515bc0c622a46711534921ba9df48b27d45fc Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 18 Sep 2015 23:39:51 -0500 Subject: [PATCH] [libpng17] Improved description of filler-byte bug fix in CHANGES and ANNOUNCE. --- ANNOUNCE | 4 ++-- CHANGES | 6 ++++-- pngtest.c | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 509fcbf8f..f449e81cb 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta66 - September 18, 2015 +Libpng 1.7.0beta66 - September 19, 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. @@ -871,7 +871,7 @@ Version 1.7.0beta65 [September 16, 2015] (but not yet by the writer) (John Bowler). Implemented shared transform handling that is used throughout (John Bowler). -Version 1.7.0beta66 [September 18, 2015] +Version 1.7.0beta66 [September 19, 2015] Enabled the low-bit-depth gray tests that were disabled in prior versions of libpng because of problems that should have been fixed by the recent changes to libpng17. Enabling the tests revealed bugs in those changes diff --git a/CHANGES b/CHANGES index e0549029f..87b8141d7 100644 --- a/CHANGES +++ b/CHANGES @@ -4981,7 +4981,9 @@ Version 1.7.0beta45 [December 28, 2014] Version 1.7.0beta46 [January 2, 2015] Regenerated configure scripts in the tar distributions with libtool-2.4.4 Implement previously untested cases of libpng transforms in pngvalid.c - Fixed byte order in 2-byte filler, in png_do_read_filler(). + Fixed byte order in png_do_read_filler() with 16-bit input. Previously + the high and low bytes of the filler, from png_set_filler() or from + png_set_add_alpha(), were read in the wrong order. Allow user to call png_get_IHDR() with NULL arguments (Reuben Hawkins). Version 1.7.0beta47 [January 29, 2015] @@ -5168,7 +5170,7 @@ Version 1.7.0beta65 [September 16, 2015] (but not yet by the writer) (John Bowler). Implemented shared transform handling that is used throughout (John Bowler). -Version 1.7.0beta66 [September 18, 2015] +Version 1.7.0beta66 [September 19, 2015] Enabled the low-bit-depth gray tests that were disabled in prior versions of libpng because of problems that should have been fixed by the recent changes to libpng17. Enabling the tests revealed bugs in those changes diff --git a/pngtest.c b/pngtest.c index c9140141f..66b50ea89 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1064,11 +1064,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) case PNG_INTERLACE_ADAM7: num_passes = 7; - break; + break; default: - png_error(read_ptr, "invalid interlace type"); - /*NOT REACHED*/ + png_error(read_ptr, "invalid interlace type"); + /*NOT REACHED*/ } }