From 1d97a4549da3a601c3b67b8b63e84c4ebfb9d36f Mon Sep 17 00:00:00 2001 From: "marina.kolpakova" Date: Wed, 28 Nov 2012 03:48:54 +0400 Subject: [PATCH] fixed compilation for GCC 4.6 --- modules/gpu/include/opencv2/gpu/device/functional.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gpu/include/opencv2/gpu/device/functional.hpp b/modules/gpu/include/opencv2/gpu/device/functional.hpp index cd63c3a..6064e8e 100644 --- a/modules/gpu/include/opencv2/gpu/device/functional.hpp +++ b/modules/gpu/include/opencv2/gpu/device/functional.hpp @@ -375,7 +375,7 @@ namespace cv { namespace gpu { namespace device { __device__ __forceinline__ signed char operator ()(signed char x) const { - return ::abs(x); + return ::abs((int)x); } __device__ __forceinline__ abs_func() {} @@ -385,7 +385,7 @@ namespace cv { namespace gpu { namespace device { __device__ __forceinline__ char operator ()(char x) const { - return ::abs(x); + return ::abs((int)x); } __device__ __forceinline__ abs_func() {} @@ -405,7 +405,7 @@ namespace cv { namespace gpu { namespace device { __device__ __forceinline__ short operator ()(short x) const { - return ::abs(x); + return ::abs((int)x); } __device__ __forceinline__ abs_func() {} -- 2.7.4