[Scummvm-cvs-logs] SF.net SVN: scummvm: [24641] scummvm/trunk/engines/scumm/he/cup_player_he. cpp

sev at users.sourceforge.net sev at users.sourceforge.net
Mon Nov 6 19:22:54 CET 2006


Revision: 24641
          http://svn.sourceforge.net/scummvm/?rev=24641&view=rev
Author:   sev
Date:     2006-11-06 10:21:07 -0800 (Mon, 06 Nov 2006)

Log Message:
-----------
Portability fix for some platforms.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/cup_player_he.cpp

Modified: scummvm/trunk/engines/scumm/he/cup_player_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/cup_player_he.cpp	2006-11-06 14:28:19 UTC (rev 24640)
+++ scummvm/trunk/engines/scumm/he/cup_player_he.cpp	2006-11-06 18:21:07 UTC (rev 24641)
@@ -222,12 +222,12 @@
 						dst += code;
 					} else if (code & 2) { // set
 						code = (code >> 2) + 1;
-						const int sz = MIN(code, dstEnd - dst);
+						const int sz = MIN((int)code, (int)(dstEnd - dst));
 						memset(dst, *data++, sz);
 						dst += sz;
 					} else { // copy
 						code = (code >> 2) + 1;
-						const int sz = MIN(code, dstEnd - dst);
+						const int sz = MIN((int)code, (int)(dstEnd - dst));
 						memcpy(dst, data, sz);
 						dst += sz;
 						data += sz;


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




More information about the Scummvm-git-logs mailing list