added test for wxScopeGuard

[wxWidgets.git] / src / common / imagpng.cpp

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index e5d7fd48a52757b5103d1f59094bc7c92876fb32..007bfadaf0e275d247f8761ec13f9405681430aa 100644 (file)
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -738,9 +738,15 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
     int iHeight = image->GetHeight();
     int iWidth = image->GetWidth();
 
-    unsigned char uchMaskRed = bHasMask ? image->GetMaskRed() : 0;
-    unsigned char uchMaskGreen = bHasMask ? image->GetMaskGreen() : 0;
-    unsigned char uchMaskBlue = bHasMask ? image->GetMaskBlue() : 0;
+    unsigned char uchMaskRed = 0, uchMaskGreen = 0, uchMaskBlue = 0;
+
+    if ( bHasMask )
+    {
+        uchMaskRed = image->GetMaskRed();
+        uchMaskGreen = image->GetMaskGreen();
+        uchMaskBlue = image->GetMaskBlue();
+    }
+
     unsigned char *pColors = image->GetData();
 
     for (int y = 0; y != iHeight; ++y)