[devel] Imported from libpng-1.5.0beta29.tar
diff --git a/pngpread.c b/pngpread.c
index 44be1c4..0568b88 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
- * Last changed in libpng 1.5.0 [June 20, 2010]
+ * Last changed in libpng 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 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.)
@@ -842,7 +842,7 @@
/* This routine must process all the data it has been given
* before returning, calling the row callback as required to
- * handle the uncomrpessed results.
+ * handle the uncompressed results.
*/
png_ptr->zstream.next_in = buffer;
png_ptr->zstream.avail_in = (uInt)buffer_length;
@@ -857,7 +857,7 @@
/* We have data for zlib, but we must check that zlib
* has somewhere to put the results. It doesn't matter
- * if we don't expect any results - it may be the input
+ * if we don't expect any results -- it may be the input
* data is just the LZ end code.
*/
if (!(png_ptr->zstream.avail_out > 0))
@@ -865,6 +865,7 @@
png_ptr->zstream.avail_out =
(uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
png_ptr->iwidth) + 1;
+
png_ptr->zstream.next_out = png_ptr->row_buf;
}
@@ -888,9 +889,10 @@
*/
if (png_ptr->row_number >= png_ptr->num_rows ||
png_ptr->pass > 6)
- png_warning(png_ptr, "Truncated compressed data");
+ png_warning(png_ptr, "Truncated compressed data in IDAT");
+
else
- png_error(png_ptr, "Decompression error");
+ png_error(png_ptr, "Decompression error in IDAT");
/* Skip the check on unprocessed input */
return;
@@ -907,9 +909,10 @@
png_ptr->pass > 6)
{
/* Extra data. */
- png_warning(png_ptr, "Extra compressed data");
+ png_warning(png_ptr, "Extra compressed data in IDAT");
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
- /* Do not more proecessing, skip the unprocessed
+
+ /* Do no more processing; skip the unprocessed
* input check below.
*/
return;
@@ -930,7 +933,7 @@
* after the zlib end code.
*/
if (png_ptr->zstream.avail_in > 0)
- png_warning(png_ptr, "Extra compression data");
+ png_warning(png_ptr, "Extra compression data in IDAT");
}
void /* PRIVATE */