fixed compilation for GCC 4.6

12 years ago · 1d97a4549d
parent 0b2c1dc871
commit 1d97a4549d
1 changed files with 3 additions and 3 deletions
--- 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() {}