diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-01-30 15:02:18 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-01-30 15:02:18 -0600 |
commit | b91528db20499eabf709a640c6578a5eaff760f3 (patch) | |
tree | 694c3e7403594c7f30d83c4ad1d674aa867e3296 /pngread.c | |
parent | 2f1dede99153fa2ef0010e7dbe41acb8d59726dd (diff) | |
download | libpng-b91528db20499eabf709a640c6578a5eaff760f3.tar.gz |
[libpng16] Quiet an uninitialized memory warning from VC2013 in png_get_png().
Diffstat (limited to 'pngread.c')
-rw-r--r-- | pngread.c | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -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 |