[libpng16] Fixed a typo in pngrutil.c, introduced in libpng-1.5.6, that

interferes with "blocky" expansion of sub-8-bit interlaced PNG files.
This commit is contained in:
Glenn Randers-Pehrson 2014-04-06 09:06:37 -05:00
parent d17313e075
commit fa26eb1678
3 changed files with 16 additions and 16 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.6.11beta03 - March 25, 2014 Libpng 1.6.11beta02 - April 6, 2014
This is not intended to be a public release. It will be replaced 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. within a few weeks by a public version or by another test version.
@ -9,20 +9,20 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a Source files with LF line endings (for Unix/Linux) and with a
"configure" script "configure" script
1.6.11beta03.tar.xz (LZMA-compressed, recommended) 1.6.11beta02.tar.xz (LZMA-compressed, recommended)
1.6.11beta03.tar.gz 1.6.11beta02.tar.gz
Source files with CRLF line endings (for Windows), without the Source files with CRLF line endings (for Windows), without the
"configure" script "configure" script
lp1611b03.7z (LZMA-compressed, recommended) lp1611b02.7z (LZMA-compressed, recommended)
lp1611b03.zip lp1611b02.zip
Other information: Other information:
1.6.11beta03-README.txt 1.6.11beta02-README.txt
1.6.11beta03-LICENSE.txt 1.6.11beta02-LICENSE.txt
libpng-1.6.11beta03-*.asc (armored detached GPG signatures) libpng-1.6.11beta02-*.asc (armored detached GPG signatures)
Changes since the last public release (1.6.10): Changes since the last public release (1.6.10):
@ -31,7 +31,7 @@ Version 1.6.11beta01 [March 17, 2014]
Changed ZlibSrcDir from 1.2.5 to 1.2.8 in projects/vstudio. Changed ZlibSrcDir from 1.2.5 to 1.2.8 in projects/vstudio.
Moved configuration information from the manual to the INSTALL file. Moved configuration information from the manual to the INSTALL file.
Version 1.6.11beta02 [March 25, 2014] Version 1.6.11beta02 [April 6, 2014]
Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because 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 they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3
when using its "__builtin_pow()" function. when using its "__builtin_pow()" function.
@ -42,8 +42,8 @@ Version 1.6.11beta02 [March 25, 2014]
Allow an easy replacement of the default pre-built configuration Allow an easy replacement of the default pre-built configuration
header with a custom header, via the make PNGLIBCONF_H_PREBUILT header with a custom header, via the make PNGLIBCONF_H_PREBUILT
macro. macro.
Fixed a typo in pngrutil.c, introduced in libpng-1.5.6, that interferes
Version 1.6.11beta03 [March 25, 2014] with "blocky" expansion of sub-8-bit interlaced PNG files.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -4880,7 +4880,7 @@ Version 1.6.11beta01 [March 17, 2014]
Changed ZlibSrcDir from 1.2.5 to 1.2.8 in projects/vstudio. Changed ZlibSrcDir from 1.2.5 to 1.2.8 in projects/vstudio.
Moved configuration information from the manual to the INSTALL file. Moved configuration information from the manual to the INSTALL file.
Version 1.6.11beta02 [March 25, 2014] Version 1.6.11beta02 [April 6, 2014]
Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because 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 they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3
when using its "__builtin_pow()" function. when using its "__builtin_pow()" function.
@ -4891,8 +4891,8 @@ Version 1.6.11beta02 [March 25, 2014]
Allow an easy replacement of the default pre-built configuration Allow an easy replacement of the default pre-built configuration
header with a custom header, via the make PNGLIBCONF_H_PREBUILT header with a custom header, via the make PNGLIBCONF_H_PREBUILT
macro. macro.
Fixed a typo in pngrutil.c, introduced in libpng-1.5.6, that interferes
Version 1.6.11beta03 [March 25, 2014] with "blocky" expansion of sub-8-bit interlaced PNG files.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -3153,7 +3153,7 @@ png_combine_row(png_const_structrp 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),\ # 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) } 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)) # define DEPTH_INDEX(d) ((d)==1?0:((d)==2?1:2))
@ -3192,7 +3192,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
#endif /* !PNG_USE_COMPILE_TIME_MASKS */ #endif /* !PNG_USE_COMPILE_TIME_MASKS */
/* Use the appropriate mask to copy the required bits. In some cases /* Use the appropriate mask to copy the required bits. In some cases
* the byte mask will be 0 or 0xff, optimize these cases. row_width is * the byte mask will be 0 or 0xff; optimize these cases. row_width is
* the number of pixels, but the code copies bytes, so it is necessary * the number of pixels, but the code copies bytes, so it is necessary
* to special case the end. * to special case the end.
*/ */