From: marina.kolpakova Date: Tue, 27 Nov 2012 23:48:54 +0000 (+0400) Subject: fixed compilation for GCC 4.6 X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~4052^2~54 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d97a4549da3a601c3b67b8b63e84c4ebfb9d36f;p=platform%2Fupstream%2Fopencv.git fixed compilation for GCC 4.6 --- 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() {}