From a7d885e4c60b044dc9e57ec1ec6a3e3b514d4b2f Mon Sep 17 00:00:00 2001 From: smatz Date: Fri, 4 Apr 2008 20:03:49 +0000 Subject: [PATCH] (svn r12572) -Fix (r12192): min() has 32bit arguments, clamping of 64bit values didn't work --- src/core/math_func.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/math_func.hpp b/src/core/math_func.hpp index 0d5c118936..63f21fd28d 100644 --- a/src/core/math_func.hpp +++ b/src/core/math_func.hpp @@ -177,7 +177,7 @@ static inline int32 ClampToI32(const int64 a) */ static inline uint16 ClampToU16(const uint64 a) { - return min(a, 0xFFFF); + return (uint16)(a <= 0xFFFFU ? a : 0xFFFFU); } /**