[libpng16] Replaced an "#if" with "ifdef" in pngrtran.c

This commit is contained in:
Glenn Randers-Pehrson 2011-11-28 10:38:41 -06:00
parent 414769b415
commit 0b26ac5dee
3 changed files with 12 additions and 8 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.6.0alpha01 - November 27, 2011 Libpng 1.6.0alpha01 - November 28, 2011
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.
@ -107,7 +107,10 @@ Version 1.5.7beta05 [(PENDING RELEASE)]
Added MINGW support to CMakeLists.txt Added MINGW support to CMakeLists.txt
Reject invalid compression flag or method when reading the iTXt chunk. Reject invalid compression flag or method when reading the iTXt chunk.
Version 1.6.0alpha01 [November 27, 2011] Version 1.6.0alpha01 [November 28, 2011]
Removed machine-generated configure files from the GIT repository (they will
continue to appear in the tarball distributions).
Restored the new 'simplified' API, which was deleted from libpng-1.5.7.
Added example programs for the new 'simplified' API. Added example programs for the new 'simplified' API.
Moved pngvalid.c into contrib/libtests Moved pngvalid.c into contrib/libtests
Rebuilt Makefile.in, configure, etc., with autoconf-2.68 Rebuilt Makefile.in, configure, etc., with autoconf-2.68
@ -126,8 +129,7 @@ Version 1.6.0alpha01 [November 27, 2011]
seems likely that it will ask 'malloc' for more than 65535 bytes with any seems likely that it will ask 'malloc' for more than 65535 bytes with any
image that has a sufficiently large row size (rather than simply failing image that has a sufficiently large row size (rather than simply failing
to read such images). to read such images).
Removed machine-generated configure files from the GIT repository (they will Replaced an "#if" with "ifdef" in pngrtran.c
continue to appear in the tarball distributions).
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

@ -3752,7 +3752,10 @@ Version 1.5.7beta05 [(PENDING RELEASE)]
Added MINGW support to CMakeLists.txt Added MINGW support to CMakeLists.txt
Reject invalid compression flag or method when reading the iTXt chunk. Reject invalid compression flag or method when reading the iTXt chunk.
Version 1.6.0alpha01 [November 27, 2011] Version 1.6.0alpha01 [November 28, 2011]
Removed machine-generated configure files from the GIT repository (they will
continue to appear in the tarball distributions).
Restored the new 'simplified' API, which was deleted from libpng-1.5.7.
Added example programs for the new 'simplified' API. Added example programs for the new 'simplified' API.
Moved pngvalid.c into contrib/libtests Moved pngvalid.c into contrib/libtests
Rebuilt Makefile.in, configure, etc., with autoconf-2.68 Rebuilt Makefile.in, configure, etc., with autoconf-2.68
@ -3771,8 +3774,7 @@ Version 1.6.0alpha01 [November 27, 2011]
seems likely that it will ask 'malloc' for more than 65535 bytes with any seems likely that it will ask 'malloc' for more than 65535 bytes with any
image that has a sufficiently large row size (rather than simply failing image that has a sufficiently large row size (rather than simply failing
to read such images). to read such images).
Removed machine-generated configure files from the GIT repository (they will Replaced an "#if" with "ifdef" in pngrtran.c
continue to appear in the tarball distributions).
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

@ -1955,7 +1955,7 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
info_ptr->bit_depth = 8; info_ptr->bit_depth = 8;
# else # else
# if PNG_READ_SCALE_16_TO_8_SUPPORTED # ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
png_ptr->transformations |= PNG_SCALE_16_TO_8; png_ptr->transformations |= PNG_SCALE_16_TO_8;
info_ptr->bit_depth = 8; info_ptr->bit_depth = 8;
# else # else