From 2a99d3d4b14e34190cd730bb834c60131324ff0f Mon Sep 17 00:00:00 2001 From: Sven Hesse Date: Tue, 5 Oct 2010 20:59:47 +0000 Subject: GOB: Silence compiler warnings svn-id: r53036 --- engines/gob/surface.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/gob/surface.cpp') diff --git a/engines/gob/surface.cpp b/engines/gob/surface.cpp index dc3e92f200..554edfc753 100644 --- a/engines/gob/surface.cpp +++ b/engines/gob/surface.cpp @@ -344,8 +344,8 @@ void Surface::blitScaled(const Surface &from, int16 left, int16 top, int16 right // Color depths have to fit assert(_bpp == from._bpp); - uint16 dWidth = floor((_width / scale).toDouble()); - uint16 dHeight = floor((_height / scale).toDouble()); + uint16 dWidth = (uint16) floor((_width / scale).toDouble()); + uint16 dHeight = (uint16) floor((_height / scale).toDouble()); // Clip if (!clipBlitRect(left, top, right, bottom, x, y, dWidth, dHeight, from._width, from._height)) @@ -359,8 +359,8 @@ void Surface::blitScaled(const Surface &from, int16 left, int16 top, int16 right // Nothing to do return; - width = MIN(floor((width * scale).toDouble()), _width); - height = MIN(floor((height * scale).toDouble()), _height); + width = MIN((int32) floor((width * scale).toDouble()), _width); + height = MIN((int32) floor((height * scale).toDouble()), _height); // Pointers to the blit destination and source start points byte *dst = getData(x , y); -- cgit v1.2.3