Revert "Set png_ptr->old_prev_row_size=0 to force prev_row to be cleared"
This reverts commit f4276c36c9
.
This commit is contained in:
parent
f4276c36c9
commit
0fcbf05b6d
2
ANNOUNCE
2
ANNOUNCE
@ -54,8 +54,6 @@ version 1.2.37beta01 [May 14, 2009]
|
||||
version 1.2.37beta02 [May 16, 2009]
|
||||
Fixed typo in libpng documentation (FILTER_AVE should be FILTER_AVG)
|
||||
Relocated misplaced #endif in pngwrite.c, sCAL chunk handler.
|
||||
In pngpread.c and pngrutil.c, set png_ptr->old_prev_row_size=0 to
|
||||
force the prev_row array to be cleared before row 0 of each pass.
|
||||
|
||||
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
||||
|
||||
|
2
CHANGES
2
CHANGES
@ -2379,8 +2379,6 @@ version 1.2.37beta01 [May 14, 2009]
|
||||
version 1.2.37beta02 [May 16, 2009]
|
||||
Fixed typo in libpng documentation (FILTER_AVE should be FILTER_AVG)
|
||||
Relocated misplaced #endif in pngwrite.c, sCAL chunk handler.
|
||||
In pngpread.c and pngrutil.c, set png_ptr->old_prev_row_size=0 to
|
||||
force the prev_row array to be cleared before row 0 of each pass.
|
||||
|
||||
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
|
||||
(subscription required; visit
|
||||
|
10
pngpread.c
10
pngpread.c
@ -1,9 +1,9 @@
|
||||
|
||||
/* pngpread.c - read a png file in push mode
|
||||
*
|
||||
* Last changed in libpng 1.2.37 [May 16, 2009]
|
||||
* Last changed in libpng 1.2.32 [September 18, 2008]
|
||||
* For conditions of distribution and use, see copyright notice in png.h
|
||||
* Copyright (c) 1998-2009 Glenn Randers-Pehrson
|
||||
* Copyright (c) 1998-2008 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.)
|
||||
*/
|
||||
@ -1013,12 +1013,11 @@ png_read_push_finish_row(png_structp png_ptr)
|
||||
if (png_ptr->row_number < png_ptr->num_rows)
|
||||
return;
|
||||
|
||||
png_ptr->old_prev_row_size = 0; /* Force clearing prev_row */
|
||||
|
||||
#ifdef PNG_READ_INTERLACING_SUPPORTED
|
||||
if (png_ptr->interlaced)
|
||||
{
|
||||
png_ptr->row_number = 0;
|
||||
png_memset_check(png_ptr, png_ptr->prev_row, 0,
|
||||
png_ptr->rowbytes + 1);
|
||||
do
|
||||
{
|
||||
png_ptr->pass++;
|
||||
@ -1050,7 +1049,6 @@ png_read_push_finish_row(png_structp png_ptr)
|
||||
|
||||
} while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);
|
||||
}
|
||||
#endif /* PNG_READ_INTERLACING_SUPPORTED */
|
||||
}
|
||||
|
||||
#if defined(PNG_READ_tEXt_SUPPORTED)
|
||||
|
@ -1,7 +1,7 @@
|
||||
|
||||
/* pngrutil.c - utilities to read a PNG file
|
||||
*
|
||||
* Last changed in libpng 1.2.37 [May 16, 2009]
|
||||
* Last changed in libpng 1.2.37 [May 15, 2009]
|
||||
* For conditions of distribution and use, see copyright notice in png.h
|
||||
* Copyright (c) 1998-2009 Glenn Randers-Pehrson
|
||||
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||
@ -2913,13 +2913,12 @@ png_read_finish_row(png_structp png_ptr)
|
||||
if (png_ptr->row_number < png_ptr->num_rows)
|
||||
return;
|
||||
|
||||
/* Force prev_row to be cleared. */
|
||||
png_ptr->old_prev_row_size=0;
|
||||
|
||||
#ifdef PNG_READ_INTERLACING_SUPPORTED
|
||||
if (png_ptr->interlaced)
|
||||
{
|
||||
png_ptr->row_number = 0;
|
||||
png_memset_check(png_ptr, png_ptr->prev_row, 0,
|
||||
png_ptr->rowbytes + 1);
|
||||
do
|
||||
{
|
||||
png_ptr->pass++;
|
||||
|
Reference in New Issue
Block a user