[devel] Fixed a bug in handling of interlaced images (bero at arklinux.org).

This commit is contained in:
Glenn Randers-Pehrson 2011-01-14 15:47:37 -06:00
parent 3200e1e088
commit e15a96b333
3 changed files with 6 additions and 4 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.5.1beta02 - January 9, 2011
Libpng 1.5.1beta02 - January 14, 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.
@ -35,7 +35,8 @@ version 1.5.1beta01 [January 8, 2011]
Ensure that png_rgb_to_gray ignores palette mapped images,
Fixed the failure to handle palette mapped images correctly.
Version 1.5.1beta02 [January 9, 2011]
Version 1.5.1beta02 [January 14, 2011]
Fixed a bug in handling of interlaced images (bero at arklinux.org).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit

View File

@ -3151,7 +3151,8 @@ version 1.5.1beta01 [January 8, 2011]
Ensure that png_rgb_to_gray ignores palette mapped images,
Fixed the failure to handle palette mapped images correctly.
Version 1.5.1beta02 [January 9, 2011]
Version 1.5.1beta02 [January 14, 2011]
Fixed a bug in handling of interlaced images (bero at arklinux.org).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

View File

@ -841,7 +841,7 @@ png_read_image(png_structp png_ptr, png_bytepp image)
}
else
{
if (!(png_ptr->transformations & PNG_INTERLACE))
if (png_ptr->interlaced && !(png_ptr->transformations & PNG_INTERLACE))
{
/* Caller called png_start_read_image or png_read_update_info without
* first turning on the PNG_INTERLACE transform. We can fix this here,