From 368971ec8b7676f8594f852e800a901950fca2dc Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Wed, 7 Oct 2009 12:48:44 -0500
Subject: [PATCH] [master] Eliminated a shadowed declaration

of "pp" in png_handle_sPLT().
---
 ANNOUNCE   | 5 +++--
 CHANGES    | 5 +++--
 pngrutil.c | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 5a2ef0b0f..f8cb018c2 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.2.41beta04 - October 5, 2009
+Libpng 1.2.41beta04 - October 7, 2009
 
 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.
@@ -55,9 +55,10 @@ version 1.2.41beta03 [October 1, 2009]
   Revised png_check_IHDR() again, to check info_ptr members instead of
     the contents of the returned parameters.
 
-version 1.2.41beta04 [October 5, 2009]
+version 1.2.41beta04 [October 7, 2009]
   Added "xcode" project similar one already in libpng-1.4.0beta (Alam Arias).
   Ported some cosmetic changes from libpng-1.4.0beta86.
+  Eliminated a shadowed declaration of "pp" in png_handle_sPLT().
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 
diff --git a/CHANGES b/CHANGES
index 8c01d138d..6d6e5e043 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2466,7 +2466,7 @@ version 1.2.40beta01 [August 20, 2009]
 version 1.2.40rc01 [September 2, 2009]
   Various bugfixes and improvements to CMakeLists.txt (Philip Lowman)
 
-version 1.2.40 and 1.0.49 [October 5, 2009]
+version 1.2.40 and 1.0.49 [October 7, 2009]
   No changes.
 
 version 1.0.50 [September 10, 2009]
@@ -2485,9 +2485,10 @@ version 1.2.41beta03 [October 1, 2009]
   Revised png_check_IHDR() again, to check info_ptr members instead of
     the contents of the returned parameters.
 
-version 1.2.41beta04 [October 5, 2009]
+version 1.2.41beta04 [October 7, 2009]
   Added "xcode" project similar one already in libpng-1.4.0beta (Alam Arias).
   Ported some cosmetic changes from libpng-1.4.0beta86.
+  Eliminated a shadowed declaration of "pp" in png_handle_sPLT().
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngrutil.c b/pngrutil.c
index f656dfbdf..69513ad53 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1120,14 +1120,14 @@ png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 }
 #endif /* PNG_READ_iCCP_SUPPORTED */
 
-#if defined(PNG_READ_sPLT_SUPPORTED)
+#ifdef PNG_READ_sPLT_SUPPORTED
 void /* PRIVATE */
 png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 /* Note: this does not properly handle chunks that are > 64K under DOS */
 {
    png_bytep entry_start;
    png_sPLT_t new_palette;
-#ifdef PNG_NO_POINTER_INDEXING
+#ifndef PNG_NO_POINTER_INDEXING
    png_sPLT_entryp pp;
 #endif
    int data_length, entry_size, i;
@@ -1213,7 +1213,7 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 #ifndef PNG_NO_POINTER_INDEXING
    for (i = 0; i < new_palette.nentries; i++)
    {
-      png_sPLT_entryp pp = new_palette.entries + i;
+      pp = new_palette.entries + i;
 
       if (new_palette.depth == 8)
       {