diff --git a/ANNOUNCE b/ANNOUNCE index d0b7d66a5..2b2ec9730 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.13rc01 - January 28, 2014 +Libpng 1.4.13rc02 - 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.4.13rc01.tar.xz (LZMA-compressed, recommended) - 1.4.13rc01.tar.gz - 1.4.13rc01.tar.bz2 + 1.4.13rc02.tar.xz (LZMA-compressed, recommended) + 1.4.13rc02.tar.gz + 1.4.13rc02.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1413r01.7z (LZMA-compressed, recommended) - lp1413r01.zip + lp1413r02.7z (LZMA-compressed, recommended) + lp1413r02.zip Other information: - 1.4.13rc01-README.txt - 1.4.13rc01-LICENSE.txt + 1.4.13rc02-README.txt + 1.4.13rc02-LICENSE.txt Changes since the last public release (1.4.11): @@ -61,6 +61,9 @@ version 1.4.13beta06 [January 22, 2014] version 1.4.13rc01 [January 28, 2014] No changes. +version 1.4.13rc02 [January 30, 2014] + Quiet an uninitialized memory warning from VC2013 in png_get_png(). + Send comments/corrections/commendations to glennrp at users.sourceforge.net or 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 362385233..b4c2853c3 100644 --- a/CHANGES +++ b/CHANGES @@ -2900,9 +2900,12 @@ version 1.4.13beta05 [January 10, 2014] version 1.4.13beta06 [January 22, 2014] Quiet set-but-not-used warnings in pngset.c -version 1.4.13brc01 [January 28, 2014] +version 1.4.13rc01 [January 28, 2014] No changes. +version 1.4.13rc02 [January 30, 2014] + Quiet an uninitialized memory warning from VC2013 in png_get_png(). + Send comments/corrections/commendations to glennrp at users.sourceforge.net or 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 2c92b5f98..829dc9f01 100644 --- a/pngread.c +++ b/pngread.c @@ -1,8 +1,8 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.4.10 [March 8, 2012] - * Copyright (c) 1998-2012 Glenn Randers-Pehrson + * Last changed in libpng 1.4.13 [%RDATE%] + * 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.) * @@ -1232,7 +1232,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 @@ -1251,14 +1251,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