[libpng16] Corrected a misplaced closing bracket in contrib/libtests/pngvalid.c

(Flavio Medeiros).
This commit is contained in:
Glenn Randers-Pehrson 2013-04-13 11:55:08 -05:00
parent b44cd59ad9
commit 364acf40aa
3 changed files with 11 additions and 3 deletions

View File

@ -34,6 +34,8 @@ Version 1.6.2beta01 [April 13, 2013]
png_set of the transform function, but that doesn't matter unless the 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 function changes the rowbuf size, and that is only valid if
transform_info is called. 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 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -4482,6 +4482,8 @@ Version 1.6.2beta01 [April 13, 2013]
png_set of the transform function, but that doesn't matter unless the 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 function changes the rowbuf size, and that is only valid if
transform_info is called. 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 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -4599,9 +4599,13 @@ progressive_row(png_structp ppIn, png_bytep new_row, png_uint_32 y, int pass)
} }
else else
png_progressive_combine_row(pp, row, new_row); png_progressive_combine_row(pp, row, new_row);
} else if (dp->interlace_type == PNG_INTERLACE_ADAM7 && #endif /* PNG_READ_INTERLACING_SUPPORTED */
PNG_ROW_IN_INTERLACE_PASS(y, pass) && }
PNG_PASS_COLS(dp->w, pass) > 0)
#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"); png_error(pp, "missing row in progressive de-interlacing");
#endif /* PNG_READ_INTERLACING_SUPPORTED */ #endif /* PNG_READ_INTERLACING_SUPPORTED */
} }