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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/bitmap.mm b/src/cocoa/bitmap.mm
index c73bc16b68526780e79a13a87f51bd9ebb5d0618..de552f54358851b20e71351840845a6bdcdbb157 100644 (file)
--- a/src/cocoa/bitmap.mm
+++ b/src/cocoa/bitmap.mm
@@ -565,12 +565,22 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
     unsigned char *dstPlanes[5] = {NULL,NULL,NULL,NULL,NULL};
     [maskRep getBitmapDataPlanes:dstPlanes];
     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)
     {
         wxPixelData<wxBitmap,wxNativePixelFormat> pixelData(const_cast<wxBitmap&>(bitmap));
         wxCHECK_MSG(wxMask_CreateFromBitmapData(pixelData, colour, dstData),
             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)
     {
         wxPixelData<wxBitmap,wxAlphaPixelFormat> pixelData(const_cast<wxBitmap&>(bitmap));