summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2011-11-28 10:31:42 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2011-11-28 10:31:42 -0600
commit02221248015dafc4a46970673d8be0f4c1410a57 (patch)
treeed1f9dc05ebf97c9f2026779a4b2fee4ef041b35
parent61b23d59b1864947be226182d890675a180ee321 (diff)
downloadlibpng-02221248015dafc4a46970673d8be0f4c1410a57.tar.gz
[libpng15] Replaced an "#if" with "ifdef" in pngrtran.c
-rw-r--r--ANNOUNCE5
-rw-r--r--CHANGES3
-rw-r--r--pngrtran.c2
3 files changed, 6 insertions, 4 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index 2c4a1b08f..d625d0d65 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.5.7beta06 - November 25, 2011
+Libpng 1.5.7beta06 - 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.
@@ -113,7 +113,8 @@ Version 1.5.7beta05 [November 25, 2011]
Moved pngvalid.c into contrib/libtests
Rebuilt Makefile.in, configure, etc., with autoconf-2.68
-Version 1.5.7beta06 [November 25, 2011]
+Version 1.5.7beta06 [November 28, 2011]
+ 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 dff4755f2..1e0f41723 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3758,7 +3758,8 @@ Version 1.5.7beta05 [November 25, 2011]
Moved pngvalid.c into contrib/libtests
Rebuilt Makefile.in, configure, etc., with autoconf-2.68
-Version 1.5.7beta06 [November 25, 2011]
+Version 1.5.7beta06 [November 28, 2011]
+ 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 084c4e514..8502221de 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1956,7 +1956,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