AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't crash in UngetRawData() if it is invalid; fixed rounding errors in alpha premultiplying

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-04-13 16:23:40 +00:00
parent 878711c01c
commit 7af64aace1
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/bitmap.cpp
View File

@ -1209,6 +1209,14 @@ void wxBitmap::UngetRawData(wxRawBitmapData *data)
{
wxCHECK_RET( data, _T("NULL pointer in wxBitmap::UngetRawData()") );
if ( !*data )
{
// invalid data, don't crash -- but don't assert neither as we're
// called automatically from wxRawBitmapData dtor and so there is no
// way to prevent this from happening
return;
}
// AlphaBlend() wants to have premultiplied source alpha but wxRawBitmap
// API uses normal, not premultiplied, colours, so adjust them here now
wxRawBitmapIterator p(*data);
@ -1224,9 +1232,9 @@ void wxBitmap::UngetRawData(wxRawBitmapData *data)
{
const unsigned alpha = p.Alpha();
p.Red() = (p.Red() * alpha) / 255;
p.Blue() = (p.Blue() * alpha) / 255;
p.Green() = (p.Green() * alpha) / 255;
p.Red() = (p.Red() * alpha + 127) / 255;
p.Blue() = (p.Blue() * alpha + 127) / 255;
p.Green() = (p.Green() * alpha + 127) / 255;
++p;
}