From af759fb3fe39e5708e48074cb6f9a84b4aaf983d Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 6 Apr 2014 08:48:27 -0500 Subject: [PATCH] [libpng15] Fixed a typo in pngrutil.c, introduced in libpng-1.5.6, that interferes with "blocky" expansion of sub-8-bit interlaced PNG files. --- ANNOUNCE | 6 ++++-- CHANGES | 4 +++- pngrutil.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 336daa539..765dc3580 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.19beta03 - March 22, 2014 +Libpng 1.5.19beta03 - April 6, 2014 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. @@ -38,7 +38,7 @@ Version 1.5.19beta02 [March 17, 2014] Use "if (value != 0)" instead of "if (value)" consistently. Moved configuration information from the manual to the INSTALL file. -Version 1.5.19beta03 [March 22, 2014] +Version 1.5.19beta03 [April 6, 2014] Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3 when using its "__builtin_pow()" function. @@ -49,6 +49,8 @@ Version 1.5.19beta03 [March 22, 2014] Allow an easy replacement of the default pre-built configuration header with a custom header, via the make PNGLIBCONF_H_PREBUILT macro. + Fixed a typo in pngrutil.c, introduced in libpng-1.5.6, that interferes + with "blocky" expansion of sub-8-bit interlaced PNG files. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 39aff7e9e..dd0bd02cd 100644 --- a/CHANGES +++ b/CHANGES @@ -4214,7 +4214,7 @@ Version 1.5.19beta02 [March 17, 2014] Use "if (value != 0)" instead of "if (value)" consistently. Moved configuration information from the manual to the INSTALL file. -Version 1.5.19beta03 [March 22, 2014] +Version 1.5.19beta03 [April 6, 2014] Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3 when using its "__builtin_pow()" function. @@ -4225,6 +4225,8 @@ Version 1.5.19beta03 [March 22, 2014] Allow an easy replacement of the default pre-built configuration header with a custom header, via the make PNGLIBCONF_H_PREBUILT macro. + Fixed a typo in pngrutil.c, introduced in libpng-1.5.6, that interferes + with "blocky" expansion of sub-8-bit interlaced PNG files. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngrutil.c b/pngrutil.c index debd76d62..66f5a72f7 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -2957,7 +2957,7 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display) # define S_MASKS(d,s) { S_MASK(0,d,s), S_MASK(1,d,s), S_MASK(2,d,s),\ S_MASK(3,d,s), S_MASK(4,d,s), S_MASK(5,d,s) } -# define B_MASKS(d,s) { B_MASK(1,d,s), S_MASK(3,d,s), S_MASK(5,d,s) } +# define B_MASKS(d,s) { B_MASK(1,d,s), B_MASK(3,d,s), B_MASK(5,d,s) } # define DEPTH_INDEX(d) ((d)==1?0:((d)==2?1:2))