diff options
| author | Sven Hesse | 2008-12-29 00:11:47 +0000 |
|---|---|---|
| committer | Sven Hesse | 2008-12-29 00:11:47 +0000 |
| commit | c5411e8b585e1ae9c3b3626b9f9d3918b6b2bf8d (patch) | |
| tree | bdfd9ce7feee6a8e8b06205eafa233ba8cc43671 | |
| parent | 4f576ef6c0855187b5d7a5308e75c6c58ea2ab97 (diff) | |
| download | scummvm-rg350-c5411e8b585e1ae9c3b3626b9f9d3918b6b2bf8d.tar.gz scummvm-rg350-c5411e8b585e1ae9c3b3626b9f9d3918b6b2bf8d.tar.bz2 scummvm-rg350-c5411e8b585e1ae9c3b3626b9f9d3918b6b2bf8d.zip | |
Explicitely using MIN<int>(). This should fix bug #2473627
svn-id: r35597
| -rw-r--r-- | engines/gob/coktelvideo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |