From: Dimitri Schoolwerth Date: Mon, 16 Aug 2004 15:32:07 +0000 (+0000) Subject: MSVC6 return warning fix X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/94406a493cf645083ac237a37bc9a3dee6691b13 MSVC6 return warning fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/image.cpp b/src/common/image.cpp index 238b5195f8..03a7d4fb9f 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -947,10 +947,10 @@ bool wxImage::ConvertAlphaToMask(unsigned threshold) wxLogError( _("No unused colour in image being masked.") ); return false; } - + SetMask(true); SetMaskColour(mr, mg, mb); - + unsigned char *imgdata = GetData(); unsigned char *alphadata = GetAlpha(); @@ -972,6 +972,8 @@ bool wxImage::ConvertAlphaToMask(unsigned threshold) free(M_IMGDATA->m_alpha); M_IMGDATA->m_alpha = NULL; + + return true; } #if wxUSE_PALETTE