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

Handle verbosity correctly in wxICOHandler loading code.

Browse Source 
Pass on the "verbose" argument to LoadDib() function instead of always being
verbose in it.

Also remove the unused IsBmp variable.

See #15918.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-03-12 23:04:05 +00:00
parent 10c3830624
commit 6c83e5cf8f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/imagbmp.cpp
View File

@@ -1403,10 +1403,9 @@ bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,
} }
bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream, bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
bool WXUNUSED(verbose), int index) bool verbose, int index)
{ {
bool bResult wxDUMMY_INITIALIZE(false); bool bResult wxDUMMY_INITIALIZE(false);
bool IsBmp = false;
ICONDIR IconDir; ICONDIR IconDir;
@@ -1480,7 +1479,7 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
if (offset != 0 && stream.SeekI(offset, wxFromCurrent) == wxInvalidOffset) if (offset != 0 && stream.SeekI(offset, wxFromCurrent) == wxInvalidOffset)
return false; return false;
bResult = LoadDib(image, stream, true, IsBmp); bResult = LoadDib(image, stream, verbose, false /* not BMP */);
bool bIsCursorType = (this->GetType() == wxBITMAP_TYPE_CUR) || (this->GetType() == wxBITMAP_TYPE_ANI); bool bIsCursorType = (this->GetType() == wxBITMAP_TYPE_CUR) || (this->GetType() == wxBITMAP_TYPE_ANI);
if ( bResult && bIsCursorType && nType == 2 ) if ( bResult && bIsCursorType && nType == 2 )
{ {