From c5411e8b585e1ae9c3b3626b9f9d3918b6b2bf8d Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Mon, 29 Dec 2008 00:11:47 +0000
Subject: Explicitely using MIN<int>(). This should fix bug #2473627

svn-id: r35597
---
 engines/gob/coktelvideo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/gob')

diff --git a/engines/gob/coktelvideo.cpp b/engines/gob/coktelvideo.cpp
index ef058d5de9..9803dba6eb 100644
--- a/engines/gob/coktelvideo.cpp
+++ b/engines/gob/coktelvideo.cpp
@@ -1452,7 +1452,7 @@ uint32 Vmd::renderFrame(int16 &left, int16 &top, int16 &right, int16 &bottom) {
 			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;
-- 
cgit v1.2.3