X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..a380af4dbff98b71780c32772625f1d974522e4e:/src/common/imagpng.cpp diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 151d3c9986..d0da8f6111 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -460,25 +460,27 @@ void CopyDataFromPNG(wxImage *image, case Transparency_Mask: if ( IsTransparent(a) ) { - // if we couldn't find a unique colour for the mask, we - // can have real pixels with the same value as the mask - // and it's better to slightly change their colour than - // to make them transparent - if ( r == rMask && g == gMask && b == bMask ) - { - r++; - } - *ptrDst++ = rMask; *ptrDst++ = bMask; *ptrDst++ = gMask; break; } - // else: !transparent - - // must be opaque then as otherwise we shouldn't be - // using the mask at all - wxASSERT_MSG( IsOpaque(a), _T("logic error") ); + else // !transparent + { + // must be opaque then as otherwise we shouldn't be + // using the mask at all + wxASSERT_MSG( IsOpaque(a), _T("logic error") ); + + // if we couldn't find a unique colour for the + // mask, we can have real pixels with the same + // value as the mask and it's better to slightly + // change their colour than to make them + // transparent + if ( r == rMask && g == gMask && b == bMask ) + { + r++; + } + } // fall through