[Scummvm-cvs-logs] SF.net SVN: scummvm:[53036] scummvm/trunk/engines/gob/surface.cpp

[drmccoy at users.sourceforge.net]

Revision: 53036
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53036&view=rev
Author:   drmccoy
Date:     2010-10-05 20:59:47 +0000 (Tue, 05 Oct 2010)

Log Message:
-----------
GOB: Silence compiler warnings

Modified Paths:
--------------
    scummvm/trunk/engines/gob/surface.cpp

Modified: scummvm/trunk/engines/gob/surface.cpp
===================================================================
--- scummvm/trunk/engines/gob/surface.cpp	2010-10-05 20:38:34 UTC (rev 53035)
+++ scummvm/trunk/engines/gob/surface.cpp	2010-10-05 20:59:47 UTC (rev 53036)
@@ -344,8 +344,8 @@
 	// 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 @@
 		// 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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.