[Scummvm-cvs-logs] scummvm master -> 039249d39b40bfa149c2a867a52c908af7f49a0f

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
039249d39b GRAPHICS: Fix compilation for Amiga


Commit: 039249d39b40bfa149c2a867a52c908af7f49a0f
    https://github.com/scummvm/scummvm/commit/039249d39b40bfa149c2a867a52c908af7f49a0f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-15T21:50:10+03:00

Commit Message:
GRAPHICS: Fix compilation for Amiga

Changed paths:
    graphics/transparent_surface.cpp



diff --git a/graphics/transparent_surface.cpp b/graphics/transparent_surface.cpp
index c2d334e..f6e8cac 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;