[libpng15] Removed two redundant tests for unitialized row.

This commit is contained in:
Glenn Randers-Pehrson 2011-10-13 17:24:36 -05:00
parent ff36991ca2
commit 3dbfd300ff
3 changed files with 10 additions and 21 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.5.6beta06 - October 12, 2011 Libpng 1.5.6beta06 - October 13, 2011
This is not intended to be a public release. It will be replaced 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. within a few weeks by a public version or by another test version.
@ -68,9 +68,10 @@ Version 1.5.6beta05 [October 12, 2011]
percentage for 16-bit and 32-bit pixels in the typical case where the percentage for 16-bit and 32-bit pixels in the typical case where the
output row buffers are appropriately aligned. The optimization was not output row buffers are appropriately aligned. The optimization was not
previously possible because the png_struct buffer was always misaligned. previously possible because the png_struct buffer was always misaligned.
Fixed bug in png_write_chunk_header() debug print, introduced in 1.5.6bet01. Fixed bug in png_write_chunk_header() debug print, introduced in 1.5.6beta01.
Version 1.5.6beta06 [October 12, 2011] Version 1.5.6beta06 [October 13, 2011]
Removed two redundant tests for unitialized row.
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

@ -3629,9 +3629,10 @@ Version 1.5.6beta05 [October 12, 2011]
percentage for 16-bit and 32-bit pixels in the typical case where the percentage for 16-bit and 32-bit pixels in the typical case where the
output row buffers are appropriately aligned. The optimization was not output row buffers are appropriately aligned. The optimization was not
previously possible because the png_struct buffer was always misaligned. previously possible because the png_struct buffer was always misaligned.
Fixed bug in png_write_chunk_header() debug print, introduced in 1.5.6bet01. Fixed bug in png_write_chunk_header() debug print, introduced in 1.5.6beta01.
Version 1.5.6beta06 [October 12, 2011] Version 1.5.6beta06 [October 13, 2011]
Removed two redundant tests for unitialized row.
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

@ -348,14 +348,8 @@ png_read_update_info(png_structp png_ptr, png_infop info_ptr)
if (png_ptr == NULL) if (png_ptr == NULL)
return; return;
if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
png_read_start_row(png_ptr); png_read_start_row(png_ptr);
else
png_warning(png_ptr,
"Ignoring extra png_read_update_info() call;"
" row buffer not reallocated");
#ifdef PNG_READ_TRANSFORMS_SUPPORTED #ifdef PNG_READ_TRANSFORMS_SUPPORTED
png_read_transform_info(png_ptr, info_ptr); png_read_transform_info(png_ptr, info_ptr);
#else #else
@ -374,15 +368,8 @@ png_start_read_image(png_structp png_ptr)
{ {
png_debug(1, "in png_start_read_image"); png_debug(1, "in png_start_read_image");
if (png_ptr == NULL) if (png_ptr != NULL)
return;
if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
png_read_start_row(png_ptr); png_read_start_row(png_ptr);
else
png_warning(png_ptr,
"Ignoring extra png_start_read_image() call;"
" row buffer not reallocated");
} }
#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */ #endif /* PNG_SEQUENTIAL_READ_SUPPORTED */