From: Vadim Zeitlin Date: Wed, 14 Jul 2010 11:20:36 +0000 (+0000) Subject: Suppress warnings about double to int truncation in wxHTML code. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9b35f81e4105ea250a6fd0533974cf6d1f722276?hp=63ced01b228ba426db163b75667a9b57d092f8db Suppress warnings about double to int truncation in wxHTML code. Actually it's not totally clear if truncation or rounding was intended here but when in doubt preserve the old code semantics. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp index fcccbd11a3..423ecf7bf5 100644 --- a/src/html/m_image.cpp +++ b/src/html/m_image.cpp @@ -534,11 +534,11 @@ void wxHtmlImageCell::Layout(int w) if (!m_bmpHpresent && m_bitmap != NULL) m_Height = m_bitmap->GetHeight()*m_Width/m_bitmap->GetWidth(); else - m_Height = m_scale*m_bmpH; + m_Height = static_cast(m_scale*m_bmpH); } else { - m_Width = m_scale*m_bmpW; - m_Height = m_scale*m_bmpH; + m_Width = static_cast(m_scale*m_bmpW); + m_Height = static_cast(m_scale*m_bmpH); } switch (m_align)