fixed compilation for GCC 4.6

1d97a454 · marina.kolpakova · 0b2c1dc8 · 1d97a454
Commit 1d97a454 authored Nov 27, 2012 by marina.kolpakova
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

functional.hpp modules/gpu/include/opencv2/gpu/device/functional.hpp +3 -3

No files found.
--- 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() {}