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

fine-tuned API from the ICO patch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-11-20 23:55:44 +00:00
parent 8065aebc48
commit 1f5b2017df
3 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/imagbmp.cpp
View File

@@ -748,8 +748,6 @@ bool wxBMPHandler::DoLoadDib (wxImage * image, int width, int height, int bpp, i
bool wxBMPHandler::LoadDib( wxImage *image, wxInputStream& stream, bool verbose, bool IsBmp )
{
wxUint8 aByte;
wxUint16 aWord;
wxInt32 dbuf[4];
wxInt8 bbuf[4];
@@ -844,7 +842,7 @@ bool wxBMPHandler::LoadDib( wxImage *image, wxInputStream& stream, bool verbose,
{
//read Icon mask which is monochrome
//there is no palette, so we will create one
wxImage mask ;
wxImage mask;
if (!DoLoadDib (&mask, width, height, 1, 2, BI_RGB, offset, stream,
verbose, IsBmp, FALSE ) )
{
@@ -852,7 +850,7 @@ bool wxBMPHandler::LoadDib( wxImage *image, wxInputStream& stream, bool verbose,
wxLogError( _("ICO: Error in reading mask DIB.") );
return FALSE;
}
image -> ApplyMask ( &mask );
image->SetMaskFromImage(mask, 255, 255, 255);
}
return TRUE;