[libpng16] Quiet an uninitialized memory warning from VC2013 in png_get_png().
diff --git a/ANNOUNCE b/ANNOUNCE
index beb3ab6..87ff1e3 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.6.9rc01 - January 28, 2014
+Libpng 1.6.9rc02 - 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,19 +9,19 @@
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- 1.6.9rc01.tar.xz (LZMA-compressed, recommended)
- 1.6.9rc01.tar.gz
+ 1.6.9rc02.tar.xz (LZMA-compressed, recommended)
+ 1.6.9rc02.tar.gz
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp169r01.7z (LZMA-compressed, recommended)
- lp169r01.zip
+ lp169r02.7z (LZMA-compressed, recommended)
+ lp169r02.zip
Other information:
- 1.6.9rc01-README.txt
- 1.6.9rc01-LICENSE.txt
+ 1.6.9rc02-README.txt
+ 1.6.9rc02-LICENSE.txt
Gnupg/*.asc (PGP armored detached signatures)
Changes since the last public release (1.6.8):
@@ -70,6 +70,9 @@
Version 1.6.9rc01 [January 28, 2014]
No changes.
+Version 1.6.9rc02 [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
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/CHANGES b/CHANGES
index 46ec60b..1be5fe6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4795,6 +4795,9 @@
Version 1.6.9rc01 [January 28, 2014]
No changes.
+Version 1.6.9rc02 [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
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/pngread.c b/pngread.c
index 0c894f7..986e95a 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1069,7 +1069,7 @@
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
@@ -1088,14 +1088,8 @@
* [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
