From 0b26ac5dee8eb10abd7f95e6c109cdbb0520213b Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 28 Nov 2011 10:38:41 -0600 Subject: [PATCH] [libpng16] Replaced an "#if" with "ifdef" in pngrtran.c --- ANNOUNCE | 10 ++++++---- CHANGES | 8 +++++--- pngrtran.c | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 313eb3bc3..380a7371c 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -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 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 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. Moved pngvalid.c into contrib/libtests 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 image that has a sufficiently large row size (rather than simply failing to read such images). - Removed machine-generated configure files from the GIT repository (they will - continue to appear in the tarball distributions). + Replaced an "#if" with "ifdef" in pngrtran.c Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index 2bf600649..ff4bc084a 100644 --- a/CHANGES +++ b/CHANGES @@ -3752,7 +3752,10 @@ Version 1.5.7beta05 [(PENDING RELEASE)] Added MINGW support to CMakeLists.txt 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. Moved pngvalid.c into contrib/libtests 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 image that has a sufficiently large row size (rather than simply failing to read such images). - Removed machine-generated configure files from the GIT repository (they will - continue to appear in the tarball distributions). + Replaced an "#if" with "ifdef" in pngrtran.c Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngrtran.c b/pngrtran.c index a204062ee..c231ea874 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1955,7 +1955,7 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr) info_ptr->bit_depth = 8; # 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; info_ptr->bit_depth = 8; # else