]> git.saurik.com Git - wxWidgets.git/commitdiff
Suppress warnings about double to int truncation in wxHTML code.
authorVadim Zeitlin <vadim@wxwidgets.org>
Wed, 14 Jul 2010 11:20:36 +0000 (11:20 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Wed, 14 Jul 2010 11:20:36 +0000 (11:20 +0000)
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

src/html/m_image.cpp

index fcccbd11a36b5e315d771d044b7403c7b747d7b4..423ecf7bf5eef73367e0b1fdf6ba85e6270a17f5 100644 (file)
@@ -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<int>(m_scale*m_bmpH);
     } else
     {
-        m_Width  = m_scale*m_bmpW;
-        m_Height = m_scale*m_bmpH;
+        m_Width  = static_cast<int>(m_scale*m_bmpW);
+        m_Height = static_cast<int>(m_scale*m_bmpH);
     }
 
     switch (m_align)