From 6c83e5cf8fd90e6d771049df0c9235f7f4446d0f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 12 Mar 2014 23:04:05 +0000 Subject: [PATCH] Handle verbosity correctly in wxICOHandler loading code. 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 --- src/common/imagbmp.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp index 127e0c41e5..0f2d7193db 100644 --- a/src/common/imagbmp.cpp +++ b/src/common/imagbmp.cpp @@ -1403,10 +1403,9 @@ bool wxICOHandler::LoadFile(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 IsBmp = false; ICONDIR IconDir; @@ -1480,7 +1479,7 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream, if (offset != 0 && stream.SeekI(offset, wxFromCurrent) == wxInvalidOffset) 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); if ( bResult && bIsCursorType && nType == 2 ) {