From 20ac0d3230bde1621f1935a3caec811bff0a4fd9 Mon Sep 17 00:00:00 2001 From: hikerstk Date: Sun, 3 Jan 2010 03:38:49 +0000 Subject: [PATCH] Removed VS compiler warnings. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4390 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/guiengine/widgets/icon_button_widget.cpp | 6 +++--- src/guiengine/widgets/ribbon_widget.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/guiengine/widgets/icon_button_widget.cpp b/src/guiengine/widgets/icon_button_widget.cpp index 880360646..ef00fba0d 100644 --- a/src/guiengine/widgets/icon_button_widget.cpp +++ b/src/guiengine/widgets/icon_button_widget.cpp @@ -59,13 +59,13 @@ void IconButtonWidget::add() } int suggested_h = h; - int suggested_w = (useAspectRatio < 0 ? w : useAspectRatio*suggested_h); + int suggested_w = (int)((useAspectRatio < 0 ? w : useAspectRatio*suggested_h)); if (suggested_w > w) { const float needed_scale_factor = (float)w / (float)suggested_w; - suggested_w *= needed_scale_factor; - suggested_h *= needed_scale_factor; + suggested_w = (int)(suggested_w*needed_scale_factor); + suggested_h = (int)(suggested_h*needed_scale_factor); } const int x_from = x + (w - suggested_w)/2; // center horizontally const int y_from = y + (h - suggested_h)/2; // center vertically diff --git a/src/guiengine/widgets/ribbon_widget.cpp b/src/guiengine/widgets/ribbon_widget.cpp index 771567b25..f6cd35e3b 100644 --- a/src/guiengine/widgets/ribbon_widget.cpp +++ b/src/guiengine/widgets/ribbon_widget.cpp @@ -167,7 +167,7 @@ void RibbonWidget::add() core::dimension2d< u32 > dim = GUIEngine::getFont()->getDimension( m_children[i].m_text.c_str() ); if ((int)dim.Width > one_button_space) { - line_count = std::ceil((float)dim.Width/(float)one_button_space); + line_count = (int)(std::ceil((float)dim.Width/(float)one_button_space)); } const int needed_space_under_button = has_label ? GUIEngine::getFontHeight()*line_count : 10;