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

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Mon Dec 29 01:11:47 CET 2008


Revision: 35597
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35597&view=rev
Author:   drmccoy
Date:     2008-12-29 00:11:47 +0000 (Mon, 29 Dec 2008)

Log Message:
-----------
Explicitely using MIN<int>(). This should fix bug #2473627

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

Modified: scummvm/trunk/engines/gob/coktelvideo.cpp
===================================================================
--- scummvm/trunk/engines/gob/coktelvideo.cpp	2008-12-29 00:03:09 UTC (rev 35596)
+++ scummvm/trunk/engines/gob/coktelvideo.cpp	2008-12-29 00:11:47 UTC (rev 35597)
@@ -1452,7 +1452,7 @@
 			while (pixWritten < postScaleX(width)) {
 				pixCount = *srcPtr++;
 				if (pixCount & 0x80) { // Data
-					pixCount = MIN((pixCount & 0x7F) + 1, postScaleX(width) - pixWritten);
+					pixCount = MIN<int>((pixCount & 0x7F) + 1, postScaleX(width) - pixWritten);
 					memcpy(dest, srcPtr, pixCount);
 
 					pixWritten += pixCount;


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