[ 1579793 ] numerous bug fixes when mask is used
Corrects PNG handling and wxImage::Paste() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1311,8 +1311,8 @@ void wxImage::Paste( const wxImage &image, int x, int y )
|
||||
{
|
||||
for (int i = 0; i < width; i+=3)
|
||||
{
|
||||
if ((source_data[i] != r) &&
|
||||
(source_data[i+1] != g) &&
|
||||
if ((source_data[i] != r) ||
|
||||
(source_data[i+1] != g) ||
|
||||
(source_data[i+2] != b))
|
||||
{
|
||||
memcpy( target_data+i, source_data+i, 3 );
|
||||
|
Reference in New Issue
Block a user