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

fixes to mask creation by colour

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-10-15 22:55:17 +00:00
parent fa7cdd7f48
commit cdcb56fc96
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/mgl/bitmap.cpp
View File

@@ -51,6 +51,26 @@ static pixel_format_t gs_pixel_format_32 =
static pixel_format_t gs_pixel_format_wxImage = static pixel_format_t gs_pixel_format_wxImage =
{0xFF,0x00,0, 0xFF,0x08,0, 0xFF,0x10,0, 0x00,0x00,0}; // RGB 24bpp for wxImage {0xFF,0x00,0, 0xFF,0x08,0, 0xFF,0x10,0, 0x00,0x00,0}; // RGB 24bpp for wxImage
//-----------------------------------------------------------------------------
// helpers
//-----------------------------------------------------------------------------
// Convert wxColour into it's quantized value in lower-precision
// pixel format (needed for masking by colour).
static wxColour wxQuantizeColour(const wxColour& clr, const wxBitmap& bmp)
{
pixel_format_t *pf = bmp.GetMGLbitmap_t()->pf;
if ( pf->redAdjust == 0 && pf->greenAdjust == 0 && pf->blueAdjust == 0 )
return clr;
else
return wxColour((clr.Red() >> pf->redAdjust) << pf->redAdjust,
(clr.Green() >> pf->greenAdjust) << pf->greenAdjust,
(clr.Blue() >> pf->blueAdjust) << pf->blueAdjust);
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxMask // wxMask
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -89,11 +109,14 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
{ {
delete m_bitmap; delete m_bitmap;
m_bitmap = NULL; m_bitmap = NULL;
wxImage image = bitmap.ConvertToImage().ConvertToMono(
colour.Red(), colour.Green(), colour.Blue());
if ( !image.Ok() ) return FALSE;
wxColour clr(wxQuantizeColour(colour, bitmap));
wxImage imgSrc(bitmap.ConvertToImage());
imgSrc.SetMask(FALSE);
wxImage image(imgSrc.ConvertToMono(clr.Red(), clr.Green(), clr.Blue()));
if ( !image.Ok() ) return FALSE;
m_bitmap = new wxBitmap(image, 1); m_bitmap = new wxBitmap(image, 1);
return m_bitmap->Ok(); return m_bitmap->Ok();