From b90077c85f1ecb7821df2b4959b4820b4fd3543f Mon Sep 17 00:00:00 2001 From: jules Date: Sat, 24 Dec 2016 09:32:37 +0000 Subject: [PATCH] Cleaned up some warnings in the PNG code --- .../juce_graphics/image_formats/juce_PNGLoader.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/juce_graphics/image_formats/juce_PNGLoader.cpp b/modules/juce_graphics/image_formats/juce_PNGLoader.cpp index 29d7aacb03..4885a49d24 100644 --- a/modules/juce_graphics/image_formats/juce_PNGLoader.cpp +++ b/modules/juce_graphics/image_formats/juce_PNGLoader.cpp @@ -446,12 +446,13 @@ namespace PNGHelpers for (size_t y = 0; y < height; ++y) rows[y] = (png_bytep) (tempBuffer + lineStride * y); - png_bytep trans_alpha; - int num_trans; - png_color_16p trans_color; - png_get_tRNS(pngReadStruct, pngInfoStruct, &trans_alpha, &num_trans, &trans_color); + png_bytep trans_alpha = nullptr; + png_color_16p trans_color = nullptr; + int num_trans = 0; + png_get_tRNS (pngReadStruct, pngInfoStruct, &trans_alpha, &num_trans, &trans_color); + if (readImageData (pngReadStruct, pngInfoStruct, errorJumpBuf, rows)) - return createImageFromData ((colorType & PNG_COLOR_MASK_ALPHA) != 0 || num_trans, + return createImageFromData ((colorType & PNG_COLOR_MASK_ALPHA) != 0 || num_trans != 0, (int) width, (int) height, rows); }