From 14678d6d227b7b82ee3250e32109d8fb73372246 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 9 Feb 2008 15:32:04 +0000 Subject: [PATCH] added alpha support to wxImage::Paste() (patch 1883497, bug 1831612) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/image.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/common/image.cpp b/src/common/image.cpp index e739d5c71e..e4ccc1b8f3 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -1283,6 +1283,26 @@ void wxImage::Paste( const wxImage &image, int x, int y ) return; } + // Copy over the alpha channel from the original image + if ( image.HasAlpha() ) + { + if ( !HasAlpha() ) + InitAlpha(); + + unsigned char* source_data = image.GetAlpha() + xx + yy*image.GetWidth(); + int source_step = image.GetWidth(); + + unsigned char* target_data = GetAlpha() + (x+xx) + (y+yy)*M_IMGDATA->m_width; + int target_step = M_IMGDATA->m_width; + + for (int j = 0; j < height; j++, + source_data += source_step, + target_data += target_step) + { + memcpy( target_data, source_data, width ); + } + } + if (!HasMask() && image.HasMask()) { unsigned char r = image.GetMaskRed(); -- 2.45.2