[Scummvm-cvs-logs] SF.net SVN: scummvm:[46308] scummvm/trunk

[lordhoto at users.sourceforge.net]

Revision: 46308
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46308&view=rev
Author:   lordhoto
Date:     2009-12-09 16:41:08 +0000 (Wed, 09 Dec 2009)

Log Message:
-----------
Slightly modified commit of patch #2911414 "MSVC: conversions warnings in common code".

Modified Paths:
--------------
    scummvm/trunk/common/rect.h
    scummvm/trunk/graphics/cursorman.h

Modified: scummvm/trunk/common/rect.h
===================================================================
--- scummvm/trunk/common/rect.h	2009-12-09 16:17:16 UTC (rev 46307)
+++ scummvm/trunk/common/rect.h	2009-12-09 16:41:08 UTC (rev 46308)
@@ -198,7 +198,7 @@
 		else if (right < r.left) right = r.left;
 	}
 
-	void clip(int maxw, int maxh) {
+	void clip(int16 maxw, int16 maxh) {
 		clip(Rect(0, 0, maxw, maxh));
 	}
 

Modified: scummvm/trunk/graphics/cursorman.h
===================================================================
--- scummvm/trunk/graphics/cursorman.h	2009-12-09 16:17:16 UTC (rev 46307)
+++ scummvm/trunk/graphics/cursorman.h	2009-12-09 16:41:08 UTC (rev 46308)
@@ -175,7 +175,7 @@
 		int _hotspotY;
 		uint32 _keycolor;
 		Graphics::PixelFormat _format;
-		byte _targetScale;
+		int _targetScale;
 
 		uint _size;
 		Cursor(const byte *data, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int targetScale = 1, const Graphics::PixelFormat *format = NULL) {


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