[libpng15] Removed two redundant tests for unitialized row.
diff --git a/ANNOUNCE b/ANNOUNCE
index 9013967..fd7253f 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -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
within a few weeks by a public version or by another test version.
@@ -68,9 +68,10 @@
percentage for 16-bit and 32-bit pixels in the typical case where the
output row buffers are appropriately aligned. The optimization was not
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:
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 186d58e..a0475ca 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3629,9 +3629,10 @@
percentage for 16-bit and 32-bit pixels in the typical case where the
output row buffers are appropriately aligned. The optimization was not
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
(subscription required; visit
diff --git a/pngread.c b/pngread.c
index 9b312a0..53b0172 100644
--- a/pngread.c
+++ b/pngread.c
@@ -348,13 +348,7 @@
if (png_ptr == NULL)
return;
- if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
- png_read_start_row(png_ptr);
-
- else
- png_warning(png_ptr,
- "Ignoring extra png_read_update_info() call;"
- " row buffer not reallocated");
+ png_read_start_row(png_ptr);
#ifdef PNG_READ_TRANSFORMS_SUPPORTED
png_read_transform_info(png_ptr, info_ptr);
@@ -374,15 +368,8 @@
{
png_debug(1, "in png_start_read_image");
- if (png_ptr == NULL)
- return;
-
- if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
- png_read_start_row(png_ptr);
- else
- png_warning(png_ptr,
- "Ignoring extra png_start_read_image() call;"
- " row buffer not reallocated");
+ if (png_ptr != NULL)
+ png_read_start_row(png_ptr);
}
#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
