From f1dd8adb83e5c25ca6e05937e27ff9818d7e6be0 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Thu, 30 Jan 2014 15:14:22 -0600
Subject: [PATCH] [libpng15] Quiet an uninitialized memory warning from VC2013
 in png_get_png().

---
 ANNOUNCE  | 20 ++++++++++++--------
 CHANGES   |  4 ++++
 pngread.c | 16 +++++-----------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index ca18e5864..2ad99c707 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.5.18rc01 - January 28, 2014
+Libpng 1.5.18rc02 - January 30, 2014
 
 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.18rc01.tar.xz (LZMA-compressed, recommended)
-   1.5.18rc01.tar.gz
-   1.5.18rc01.tar.bz2
+   1.5.18rc02.tar.xz (LZMA-compressed, recommended)
+   1.5.18rc02.tar.gz
+   1.5.18rc02.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp1518r01.7z  (LZMA-compressed, recommended)
-   lp1518r01.zip
+   lp1518r02.7z  (LZMA-compressed, recommended)
+   lp1518r02.zip
 
 Other information:
 
-   1.5.18rc01-README.txt
-   1.5.18rc01-LICENSE.txt
+   1.5.18rc02-README.txt
+   1.5.18rc02-LICENSE.txt
 
 Changes since the last public release (1.5.17):
 
@@ -71,6 +71,10 @@ Version 1.5.18beta05 [January 20, 2014]
   Updated scripts/makefile.* to use CPPFLAGS (Cosmin)
 
 Version 1.5.18rc01 [January 28, 2014]
+  No changes.
+
+Version 1.5.18rc02 [January 30, 2014]
+  Quiet an uninitialized memory warning from VC2013 in png_get_png().
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index d78bbd2ab..01588f1a0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4195,6 +4195,10 @@ Version 1.5.18beta05 [January 20, 2014]
   Updated scripts/makefile.* to use CPPFLAGS (Cosmin)
 
 Version 1.5.18rc01 [January 28, 2014]
+  No changes.
+
+Version 1.5.18rc02 [January 30, 2014]
+  Quiet an uninitialized memory warning from VC2013 in png_get_png().
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngread.c b/pngread.c
index 4296cf1cb..a81c77081 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,8 +1,8 @@
 
 /* pngread.c - read a PNG file
  *
- * Last changed in libpng 1.5.14 [January 24, 2013]
- * Copyright (c) 1998-2012 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.18 [(PENDING RELEASE)]
+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -1191,7 +1191,7 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,
    if (transforms & PNG_TRANSFORM_EXPAND)
       if ((png_ptr->bit_depth < 8) ||
           (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
-          (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
+          (info_ptr->valid & PNG_INFO_tRNS))
          png_set_expand(png_ptr);
 #endif
 
@@ -1210,14 +1210,8 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,
     * [0,65535] to the original [0,7] or [0,31], or whatever range the
     * colors were originally in:
     */
-   if ((transforms & PNG_TRANSFORM_SHIFT)
-       && png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT))
-   {
-      png_color_8p sig_bit;
-
-      png_get_sBIT(png_ptr, info_ptr, &sig_bit);
-      png_set_shift(png_ptr, sig_bit);
-   }
+   if ((transforms & PNG_TRANSFORM_SHIFT) && (info_ptr->valid & PNG_INFO_sBIT))
+      png_set_shift(png_ptr, &info_ptr->sig_bit);
 #endif
 
 #ifdef PNG_READ_BGR_SUPPORTED