diff options
| author | Sven Hesse | 2010-10-05 20:59:47 +0000 |
|---|---|---|
| committer | Sven Hesse | 2010-10-05 20:59:47 +0000 |
| commit | 2a99d3d4b14e34190cd730bb834c60131324ff0f (patch) | |
| tree | 0be31186768cf7abc91efb0707c95d408cde5cd9 /engines/gob/surface.cpp | |
| parent | 77f57cd8f83f07196e25964121d7ad2e489b53fb (diff) | |
| download | scummvm-rg350-2a99d3d4b14e34190cd730bb834c60131324ff0f.tar.gz scummvm-rg350-2a99d3d4b14e34190cd730bb834c60131324ff0f.tar.bz2 scummvm-rg350-2a99d3d4b14e34190cd730bb834c60131324ff0f.zip | |
GOB: Silence compiler warnings
svn-id: r53036
Diffstat (limited to 'engines/gob/surface.cpp')
| -rw-r--r-- | engines/gob/surface.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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<int32>(floor((width * scale).toDouble()), _width); - height = MIN<int32>(floor((height * scale).toDouble()), _height); + width = MIN<int32>((int32) floor((width * scale).toDouble()), _width); + height = MIN<int32>((int32) floor((height * scale).toDouble()), _height); // Pointers to the blit destination and source start points byte *dst = getData(x , y); |