Backed-out PNG8 patch (no time to look at why
it breaks other PNGs). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
3980000ca6
commit
f773e9b0bb
@ -287,7 +287,7 @@ FindMaskColour(unsigned char **lines, png_uint_32 width, png_uint_32 height,
|
||||
}
|
||||
}
|
||||
|
||||
if ( !h.FindFirstUnusedColour(&rMask, &gMask, &bMask, rMask, gMask, bMask) )
|
||||
if ( !h.FindFirstUnusedColour(&rMask, &gMask, &bMask) )
|
||||
{
|
||||
wxLogWarning(_("Too many colours in PNG, the image may be slightly blurred."));
|
||||
|
||||
@ -435,14 +435,8 @@ void CopyDataFromPNG(wxImage *image,
|
||||
|
||||
if ( transparency == Transparency_Mask )
|
||||
{
|
||||
if ( IsTransparent( a ) && ( ! ( rMask || gMask || bMask ) ) )
|
||||
{
|
||||
rMask = r;
|
||||
gMask = g;
|
||||
bMask = b;
|
||||
|
||||
FindMaskColour(lines, width, height, rMask, gMask, bMask );
|
||||
}
|
||||
FindMaskColour(lines, width, height,
|
||||
rMask, gMask, bMask);
|
||||
}
|
||||
else // transparency == Transparency_Alpha
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user