From 364acf40aac811113591f9f958a1e5ed0c8c3991 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 13 Apr 2013 11:55:08 -0500 Subject: [PATCH] [libpng16] Corrected a misplaced closing bracket in contrib/libtests/pngvalid.c (Flavio Medeiros). --- ANNOUNCE | 2 ++ CHANGES | 2 ++ contrib/libtests/pngvalid.c | 10 +++++++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index b5fb13508..a65bfd558 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -34,6 +34,8 @@ Version 1.6.2beta01 [April 13, 2013] png_set of the transform function, but that doesn't matter unless the transform function changes the rowbuf size, and that is only valid if transform_info is called. + 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 ff5bf7f83..cc0dbdb74 100644 --- a/CHANGES +++ b/CHANGES @@ -4482,6 +4482,8 @@ Version 1.6.2beta01 [April 13, 2013] png_set of the transform function, but that doesn't matter unless the transform function changes the rowbuf size, and that is only valid if transform_info is called. + 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 f36b1f8be..70a90bdf2 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 */ }