diff options
| author | Eugene Sandulenko | 2014-06-15 21:50:10 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-06-15 21:50:10 +0300 |
| commit | 039249d39b40bfa149c2a867a52c908af7f49a0f (patch) | |
| tree | d51c313f4e66103fed4fa2a1ad782d71f90c8bce /graphics/transparent_surface.cpp | |
| parent | 1ebb8aa6debe7fab79bd058730ac07e360a7b486 (diff) | |
| download | scummvm-rg350-039249d39b40bfa149c2a867a52c908af7f49a0f.tar.gz scummvm-rg350-039249d39b40bfa149c2a867a52c908af7f49a0f.tar.bz2 scummvm-rg350-039249d39b40bfa149c2a867a52c908af7f49a0f.zip | |
GRAPHICS: Fix compilation for Amiga
Diffstat (limited to 'graphics/transparent_surface.cpp')
| -rw-r--r-- | graphics/transparent_surface.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/graphics/transparent_surface.cpp b/graphics/transparent_surface.cpp index c2d334e731..f6e8cacb8b 100644 --- a/graphics/transparent_surface.cpp +++ b/graphics/transparent_surface.cpp @@ -239,21 +239,21 @@ void doBlitAdditiveBlend(byte *ino, byte *outo, uint32 width, uint32 height, uin uint32 ina = in[kAIndex] * ca >> 8; if (cb != 255) { - out[kBIndex] = MIN(out[kBIndex] + ((in[kBIndex] * cb * ina) >> 16), 255u); + out[kBIndex] = MIN<uint>(out[kBIndex] + ((in[kBIndex] * cb * ina) >> 16), 255u); } else { - out[kBIndex] = MIN(out[kBIndex] + (in[kBIndex] * ina >> 8), 255u); + out[kBIndex] = MIN<uint>(out[kBIndex] + (in[kBIndex] * ina >> 8), 255u); } if (cg != 255) { - out[kGIndex] = MIN(out[kGIndex] + ((in[kGIndex] * cg * ina) >> 16), 255u); + out[kGIndex] = MIN<uint>(out[kGIndex] + ((in[kGIndex] * cg * ina) >> 16), 255u); } else { - out[kGIndex] = MIN(out[kGIndex] + (in[kGIndex] * ina >> 8), 255u); + out[kGIndex] = MIN<uint>(out[kGIndex] + (in[kGIndex] * ina >> 8), 255u); } if (cr != 255) { - out[kRIndex] = MIN(out[kRIndex] + ((in[kRIndex] * cr * ina) >> 16), 255u); + out[kRIndex] = MIN<uint>(out[kRIndex] + ((in[kRIndex] * cr * ina) >> 16), 255u); } else { - out[kRIndex] = MIN(out[kRIndex] + (in[kRIndex] * ina >> 8), 255u); + out[kRIndex] = MIN<uint>(out[kRIndex] + (in[kRIndex] * ina >> 8), 255u); } in += inStep; |