Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

warning fixes for BCC and OW (heavily modified patch 819146)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-10-16 10:28:15 +00:00
parent 0cc66b6c0b
commit 999836aaca
62 changed files with 175 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/common/imagpng.cpp
View File

@@ -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
else // !transparent
{
// must be opaque then as otherwise we shouldn't be
// using the mask at all
wxASSERT_MSG( IsOpaque(a), _T("logic error") );
// 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