X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/553dce51e920b365715e619c7e67106305126ab3..21689736a7139bc341463ab3db9329029fb93b85:/src/mgl/bitmap.cpp diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp index e3ffeb7430..8ab1f1f99e 100644 --- a/src/mgl/bitmap.cpp +++ b/src/mgl/bitmap.cpp @@ -2,7 +2,7 @@ // Name: bitmap.cpp // Author: Vaclav Slavik // RCS-ID: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -51,6 +51,26 @@ static pixel_format_t gs_pixel_format_32 = static pixel_format_t gs_pixel_format_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 //----------------------------------------------------------------------------- @@ -89,11 +109,14 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) { delete m_bitmap; m_bitmap = NULL; + + wxColour clr(wxQuantizeColour(colour, bitmap)); - wxImage image = bitmap.ConvertToImage().ConvertToMono( - colour.Red(), colour.Green(), colour.Blue()); + 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); return m_bitmap->Ok(); @@ -168,16 +191,9 @@ wxBitmapRefData::~wxBitmapRefData() IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler,wxObject) IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxBitmapBase) -wxBitmap::wxBitmap() -{ - if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); -} - wxBitmap::wxBitmap(int width, int height, int depth) { Create(width, height, depth); - - if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); } @@ -262,12 +278,10 @@ bool wxBitmap::CreateFromXpm(const char **bits) *this = wxBitmap(img); - if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); - return TRUE; } -wxBitmap::wxBitmap(const wxImage& image, int depth = -1) +wxBitmap::wxBitmap(const wxImage& image, int depth) { long width, height; @@ -284,7 +298,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth = -1) MGLDevCtx *bdc = CreateTmpDC(); - if ( depth <= 8 && image.HasPalette() ) + if ( GetDepth() <= 8 && image.HasPalette() ) SetPalette(image.GetPalette()); bdc->bitBlt(idc, 0, 0, width, height, 0, 0, MGL_REPLACE_MODE); @@ -347,15 +361,11 @@ wxImage wxBitmap::ConvertToImage() const wxBitmap::wxBitmap(const wxBitmap& bmp) { Ref(bmp); - - if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); } wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type) { LoadFile(filename, type); - - if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); } wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) @@ -370,13 +380,6 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) bdc->clearDevice(); bdc->putMonoImage(0, 0, width, (width + 7) / 8, height, (void*)bits); delete bdc; - - if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); -} - -wxBitmap::~wxBitmap() -{ - if ( wxTheBitmapList ) wxTheBitmapList->DeleteObject(this); } wxBitmap& wxBitmap::operator = (const wxBitmap& bmp)