From 903c64dce8123778e40256603e71821ca3c57731 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Wed, 15 Jun 2011 11:50:23 -0500
Subject: [PATCH] [devel] Added "#ifdef PNG_READ_BACKGROUND_SUPPORTED/#endif"
 in pngrtran.c

---
 ANNOUNCE   | 19 +++++++++++--------
 CHANGES    |  3 +++
 pngrtran.c |  6 ++++--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 4013bc302..41ae62572 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.5.4beta03 - June 15, 2011
+Libpng 1.5.4beta04 - June 15, 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.
@@ -9,20 +9,20 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   1.5.4beta03.tar.xz (LZMA-compressed, recommended)
-   1.5.4beta03.tar.gz
-   1.5.4beta03.tar.bz2
+   1.5.4beta04.tar.xz (LZMA-compressed, recommended)
+   1.5.4beta04.tar.gz
+   1.5.4beta04.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp154b03.7z  (LZMA-compressed, recommended)
-   lp154b03.zip
+   lp154b04.7z  (LZMA-compressed, recommended)
+   lp154b04.zip
 
 Other information:
 
-   1.5.4beta03-README.txt
-   1.5.4beta03-LICENSE.txt
+   1.5.4beta04-README.txt
+   1.5.4beta04-LICENSE.txt
 
 Changes since the last public release (1.5.2):
 
@@ -213,6 +213,9 @@ Version 1.5.4beta03 [June 15, 2011]
   Correction to the expand_16 code; removed extra instance of
     png_set_scale_16_to_8 from pngpriv.h
 
+Version 1.5.4beta04 [June 15, 2011]
+  Added a missing "#ifdef PNG_READ_BACKGROUND_SUPPORTED/#endif" in pngrtran.c
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/CHANGES b/CHANGES
index 9e0e6d44b..155c3cdf1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3476,6 +3476,9 @@ Version 1.5.4beta03 [June 15, 2011]
   Correction to the expand_16 code; removed extra instance of
     png_set_scale_16_to_8 from pngpriv.h
 
+Version 1.5.4beta04 [June 15, 2011]
+  Added a missing "#ifdef PNG_READ_BACKGROUND_SUPPORTED/#endif" in pngrtran.c
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/pngrtran.c b/pngrtran.c
index 17f4ec1eb..9f15582d9 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1503,9 +1503,11 @@ png_init_read_transformations(png_structp png_ptr)
       || ((png_ptr->transformations & PNG_COMPOSE)
          && (png_gamma_significant(png_ptr->gamma)
             || png_gamma_significant(png_ptr->screen_gamma)
+#  ifdef PNG_READ_BACKGROUND_SUPPORTED
             || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE
-               && png_gamma_significant(png_ptr->background_gamma))))
-      || ((png_ptr->transformations & PNG_ENCODE_ALPHA)
+               && png_gamma_significant(png_ptr->background_gamma))
+#  endif
+      )) || ((png_ptr->transformations & PNG_ENCODE_ALPHA)
          && png_gamma_significant(png_ptr->screen_gamma))
       )
    {