[Scummvm-cvs-logs] SF.net SVN: scummvm:[42008] scummvm/trunk/engines/gob/inter_v1.cpp
anotherguest at users.sourceforge.net
anotherguest at users.sourceforge.net
Wed Jul 1 22:11:45 CEST 2009
Revision: 42008
http://scummvm.svn.sourceforge.net/scummvm/?rev=42008&view=rev
Author: anotherguest
Date: 2009-07-01 20:11:44 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Use MIN with correct template parameter.
Modified Paths:
--------------
scummvm/trunk/engines/gob/inter_v1.cpp
Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp 2009-07-01 20:02:33 UTC (rev 42007)
+++ scummvm/trunk/engines/gob/inter_v1.cpp 2009-07-01 20:11:44 UTC (rev 42008)
@@ -1095,7 +1095,7 @@
if (!resource)
break;
- memcpy((char *) _vm->_draw->_vgaPalette, resource->getData(), MIN(768, resource->getSize()));
+ memcpy((char *) _vm->_draw->_vgaPalette, resource->getData(), MIN<int>(768, resource->getSize()));
delete resource;
break;
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