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

Suppress harmless g++ warnings about converting float/double to int.

Browse Source 
The conversion is done on purpose on these places so just suppress the warning
by using explicit casts.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-11-18 09:56:59 +00:00
parent 46d1cdb44c
commit 945c909da9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/image.cpp
View File

@@ -668,13 +668,13 @@ wxImage wxImage::ResampleBilinear(int width, int height) const
//result lines //result lines
dst_data[0] = r1 * dy1 + r2 * dy; dst_data[0] = static_cast<unsigned char>(r1 * dy1 + r2 * dy);
dst_data[1] = g1 * dy1 + g2 * dy; dst_data[1] = static_cast<unsigned char>(g1 * dy1 + g2 * dy);
dst_data[2] = b1 * dy1 + b2 * dy; dst_data[2] = static_cast<unsigned char>(b1 * dy1 + b2 * dy);
dst_data += 3; dst_data += 3;
if ( src_alpha ) if ( src_alpha )
*dst_alpha++ = a1 * dy1 + a2 * dy; *dst_alpha++ = static_cast<unsigned char>(a1 * dy1 + a2 * dy);
} }
} }

2
src/richtext/richtexthtml.cpp
View File

@@ -322,7 +322,7 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(
str << wxT(">"); str << wxT(">");
// TODO: convert to pixels // TODO: convert to pixels
int indentPixels = indentLeftMM*10/4; int indentPixels = static_cast<int>(indentLeftMM*10/4);
if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) == 0) if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) == 0)
{ {