diff --git a/ANNOUNCE b/ANNOUNCE index c01b6b959..05595c44a 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.16beta01 - March 29, 2013 +Libpng 1.5.16beta01 - April 13, 2013 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. @@ -26,7 +26,9 @@ Other information: Changes since the last public release (1.5.15): -Version 1.5.16beta01 [March 29, 2013] +Version 1.5.16beta01 [April 13, 2013] + Corrected a misplaced closing bracket in contrib/libtests/pngvalid.c + (Flavio Medeiros). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index b2c2ec3d8..ca3787560 100644 --- a/CHANGES +++ b/CHANGES @@ -4070,7 +4070,9 @@ Version 1.5.15rc01 [March 21, 2013] Version 1.5.15 [March 28, 2013] No changes. -Version 1.5.16beta01 [March 29, 2013] +Version 1.5.16beta01 [April 13, 2013] + Corrected a misplaced closing bracket in contrib/libtests/pngvalid.c + (Flavio Medeiros). 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 72a09e5b9..71545a3ff 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -4599,9 +4599,13 @@ progressive_row(png_structp ppIn, png_bytep new_row, png_uint_32 y, int pass) } else png_progressive_combine_row(pp, row, new_row); - } else if (dp->interlace_type == PNG_INTERLACE_ADAM7 && - PNG_ROW_IN_INTERLACE_PASS(y, pass) && - PNG_PASS_COLS(dp->w, pass) > 0) +#endif /* PNG_READ_INTERLACING_SUPPORTED */ + } + +#ifdef PNG_READ_INTERLACING_SUPPORTED + else if (dp->interlace_type == PNG_INTERLACE_ADAM7 && + PNG_ROW_IN_INTERLACE_PASS(y, pass) && + PNG_PASS_COLS(dp->w, pass) > 0) png_error(pp, "missing row in progressive de-interlacing"); #endif /* PNG_READ_INTERLACING_SUPPORTED */ }