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

Applied patch for PNG8 alpha mask.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-12-08 22:29:25 +00:00
parent 4ae1af0588
commit e854ed477e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/imagpng.cpp
View File

@@ -287,7 +287,7 @@ FindMaskColour(unsigned char **lines, png_uint_32 width, png_uint_32 height,
} }
} }
if ( !h.FindFirstUnusedColour(&rMask, &gMask, &bMask) ) if ( !h.FindFirstUnusedColour(&rMask, &gMask, &bMask, rMask, gMask, bMask) )
{ {
wxLogWarning(_("Too many colours in PNG, the image may be slightly blurred.")); wxLogWarning(_("Too many colours in PNG, the image may be slightly blurred."));
@@ -435,8 +435,14 @@ void CopyDataFromPNG(wxImage *image,
if ( transparency == Transparency_Mask ) if ( transparency == Transparency_Mask )
{ {
FindMaskColour(lines, width, height, if ( IsTransparent( a ) && ( ! ( rMask || gMask || bMask ) ) )
rMask, gMask, bMask); {
rMask = r;
gMask = g;
bMask = b;
FindMaskColour(lines, width, height, rMask, gMask, bMask );
}
} }
else // transparency == Transparency_Alpha else // transparency == Transparency_Alpha
{ {