diff --git a/ANNOUNCE b/ANNOUNCE index 3a8e6bf18..3ea7819f5 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta29 - January 20, 2014 +Libpng 1.7.0beta29 - 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. @@ -493,7 +493,8 @@ Version 1.7.0beta28 [January 20, 2014] Updated scripts/makefile.* to use CPPFLAGS (Cosmin). Added clang attribute support (Cosmin). -Version 1.7.0beta29 [January 20, 2014] +Version 1.7.0beta29 [January 30, 2014] + Quiet an uninitialized memory warning from VS2013 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 550f4776f..a316b72b2 100644 --- a/CHANGES +++ b/CHANGES @@ -4782,7 +4782,8 @@ Version 1.7.0beta28 [January 20, 2014] Updated scripts/makefile.* to use CPPFLAGS (Cosmin). Added clang attribute support (Cosmin). -Version 1.7.0beta29 [January 20, 2014] +Version 1.7.0beta29 [January 30, 2014] + Quiet an uninitialized memory warning from VS2013 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 8e2596db9..9eb71e891 100644 --- a/pngread.c +++ b/pngread.c @@ -1069,7 +1069,7 @@ png_read_png(png_structrp png_ptr, png_inforp 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 @@ -1088,14 +1088,8 @@ png_read_png(png_structrp png_ptr, png_inforp 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