diff --git a/ANNOUNCE b/ANNOUNCE index e59b14914707758b4f522d4b93831c705275bf4a..d350871177a4a2d85454a8b6e7d5186407a4e165 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.0beta76 - August 21, 2009 +Libpng 1.4.0beta76 - August 22, 2009 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. @@ -534,7 +534,8 @@ version 1.4.0beta75 [August 21, 2009] Removed an extra png_debug() recently added to png_write_find_filter(). Fixed incorrect #ifdef in pngset.c regarding unknown chunk support. -version 1.4.0beta76 [August 21, 2009] +version 1.4.0beta76 [August 22, 2009] + Moved an incorrectly located test in png_read_row() in pngread.c version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. diff --git a/CHANGES b/CHANGES index 504e5af02c72969f230384f6fe42663990f6d877..3c9f1548115bc92abeea0bf9806fb0d4ccb738e6 100644 --- a/CHANGES +++ b/CHANGES @@ -2211,7 +2211,8 @@ version 1.4.0beta75 [August 21, 2009] Removed an extra png_debug() recently added to png_write_find_filter(). Fixed incorrect #ifdef in pngset.c regarding unknown chunk support. -version 1.4.0beta76 [August 21, 2009] +version 1.4.0beta76 [August 22, 2009] + Moved an incorrectly located test in png_read_row() in pngread.c version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. diff --git a/pngread.c b/pngread.c index df62c08494c2381e1d6871e9089f68a8232752ca..b18ddf5d998ac1865cca3660b2af1b4ee54ff5cb 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.4.0 [August 21, 2009] + * Last changed in libpng 1.4.0 [August 22, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -454,13 +454,13 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row) PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff}; #endif int ret; - - png_debug2(1, "in png_read_row (row %lu, pass %d)", if (png_ptr == NULL) return; + png_debug2(1, "in png_read_row (row %lu, pass %d)", (unsigned long) png_ptr->row_number, png_ptr->pass); + if (!(png_ptr->flags & PNG_FLAG_ROW_INIT)) png_read_start_row(png_ptr); if (png_ptr->row_number == 0 && png_ptr->pass == 0)