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

Add support for wxMask creation from RGBx data (x=unused)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-12-09 03:21:38 +00:00
parent 2f4df0ecb9
commit ea3d4caf99
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cocoa/bitmap.mm
View File

@@ -565,12 +565,22 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
unsigned char *dstPlanes[5] = {NULL,NULL,NULL,NULL,NULL}; unsigned char *dstPlanes[5] = {NULL,NULL,NULL,NULL,NULL};
[maskRep getBitmapDataPlanes:dstPlanes]; [maskRep getBitmapDataPlanes:dstPlanes];
unsigned char *dstData = dstPlanes[1]; unsigned char *dstData = dstPlanes[1];
// The wxImage format (which we use whenever we imported from wxImage)
if([srcBitmapRep bitsPerPixel]==24 && [srcBitmapRep bitsPerSample]==8 && [srcBitmapRep samplesPerPixel]==3 && [srcBitmapRep hasAlpha]==NO) if([srcBitmapRep bitsPerPixel]==24 && [srcBitmapRep bitsPerSample]==8 && [srcBitmapRep samplesPerPixel]==3 && [srcBitmapRep hasAlpha]==NO)
{ {
wxPixelData<wxBitmap,wxNativePixelFormat> pixelData(const_cast<wxBitmap&>(bitmap)); wxPixelData<wxBitmap,wxNativePixelFormat> pixelData(const_cast<wxBitmap&>(bitmap));
wxCHECK_MSG(wxMask_CreateFromBitmapData(pixelData, colour, dstData), wxCHECK_MSG(wxMask_CreateFromBitmapData(pixelData, colour, dstData),
false, "Unable to access raw data"); false, "Unable to access raw data");
} }
// 32-bpp RGBx (x=throw away, no alpha)
else if([srcBitmapRep bitsPerPixel]==32 && [srcBitmapRep bitsPerSample]==8 && [srcBitmapRep samplesPerPixel]==3 && [srcBitmapRep hasAlpha]==NO)
{
typedef wxPixelFormat<unsigned char,32,0,1,2> PixelFormat;
wxPixelData<wxBitmap,PixelFormat> pixelData(const_cast<wxBitmap&>(bitmap));
wxCHECK_MSG(wxMask_CreateFromBitmapData(pixelData, colour, dstData),
false, "Unable to access raw data");
}
// 32-bpp RGBA
else if([srcBitmapRep bitsPerPixel]==32 && [srcBitmapRep bitsPerSample]==8 && [srcBitmapRep samplesPerPixel]==4 && [srcBitmapRep hasAlpha]==YES) else if([srcBitmapRep bitsPerPixel]==32 && [srcBitmapRep bitsPerSample]==8 && [srcBitmapRep samplesPerPixel]==4 && [srcBitmapRep hasAlpha]==YES)
{ {
wxPixelData<wxBitmap,wxAlphaPixelFormat> pixelData(const_cast<wxBitmap&>(bitmap)); wxPixelData<wxBitmap,wxAlphaPixelFormat> pixelData(const_cast<wxBitmap&>(bitmap));