From 4cffca0da71771d0d51ba4cd4842d2d93aa2946e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 2 Oct 2012 21:38:23 +0300
Subject: Fix some conversions.

---
 src/guichan/color.cpp           | 6 +++---
 src/guichan/sdl/sdlgraphics.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/guichan')

diff --git a/src/guichan/color.cpp b/src/guichan/color.cpp
index 7cc3b887a..87d110b63 100644
--- a/src/guichan/color.cpp
+++ b/src/guichan/color.cpp
@@ -106,9 +106,9 @@ namespace gcn
 
     Color Color::operator*(const float value) const
     {
-        Color result(static_cast<int>(r * value), 
-                     static_cast<int>(g * value), 
-                     static_cast<int>(b * value), 
+        Color result(static_cast<int>(static_cast<float>(r) * value),
+                     static_cast<int>(static_cast<float>(g) * value),
+                     static_cast<int>(static_cast<float>(b) * value),
                      a);
 
         result.r = (result.r > 255 ? 255 : (result.r < 0 ? 0 : result.r));
diff --git a/src/guichan/sdl/sdlgraphics.cpp b/src/guichan/sdl/sdlgraphics.cpp
index 952be9093..482642e30 100644
--- a/src/guichan/sdl/sdlgraphics.cpp
+++ b/src/guichan/sdl/sdlgraphics.cpp
@@ -596,8 +596,8 @@ namespace gcn
 
         const ClipRectangle& top = mClipStack.top();
 
-        destination.x += top.xOffset;
-        destination.y += top.yOffset;
+        destination.x += static_cast<int16_t>(top.xOffset);
+        destination.y += static_cast<int16_t>(top.yOffset);
 
         SDL_BlitSurface(surface, &source, mTarget, &destination);
     }
-- 
cgit v1.2.3-60-g2f50