generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed compilation for GCC 4.6

Browse Source
This commit is contained in:
marina.kolpakova 2012-11-28 03:48:54 +04:00
parent 0b2c1dc871
commit 1d97a4549d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gpu/include/opencv2/gpu/device/functional.hpp
View File

@ -375,7 +375,7 @@ namespace cv { namespace gpu { namespace device
{ {
__device__ __forceinline__ signed char operator ()(signed char x) const __device__ __forceinline__ signed char operator ()(signed char x) const
{ {
return ::abs(x); return ::abs((int)x);
} }
__device__ __forceinline__ abs_func() {} __device__ __forceinline__ abs_func() {}
@ -385,7 +385,7 @@ namespace cv { namespace gpu { namespace device
{ {
__device__ __forceinline__ char operator ()(char x) const __device__ __forceinline__ char operator ()(char x) const
{ {
return ::abs(x); return ::abs((int)x);
} }
__device__ __forceinline__ abs_func() {} __device__ __forceinline__ abs_func() {}
@ -405,7 +405,7 @@ namespace cv { namespace gpu { namespace device
{ {
__device__ __forceinline__ short operator ()(short x) const __device__ __forceinline__ short operator ()(short x) const
{ {
return ::abs(x); return ::abs((int)x);
} }
__device__ __forceinline__ abs_func() {} __device__ __forceinline__ abs_func() {}