From e15a96b33312e8a44c510dfdbc8a4d2643d8ba33 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 14 Jan 2011 15:47:37 -0600 Subject: [PATCH] [devel] Fixed a bug in handling of interlaced images (bero at arklinux.org). --- ANNOUNCE | 5 +++-- CHANGES | 3 ++- pngread.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 0ca7e8d0c..9d99aebdf 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -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 diff --git a/CHANGES b/CHANGES index 0b0a2cffd..29d679273 100644 --- a/CHANGES +++ b/CHANGES @@ -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 diff --git a/pngread.c b/pngread.c index e092ccefd..056bcbdac 100644 --- a/pngread.c +++ b/pngread.c @@ -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,