Skip to content

O
opencv
Commit f536dfa4 authored by Vladislav Vinogradov's avatar Vladislav Vinogradov
Browse files
Options

fixed build under linux

parent 9da6d789
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
modules/gpu/src/cuda/matrix_reductions.cu
View file @ f536dfa4
...@@ -1820,7 +1820,7 @@ namespace cv { namespace gpu { namespace mathfunc ...@@ -1820,7 +1820,7 @@ namespace cv { namespace gpu { namespace mathfunc
return a + b; return a + b;
} }
__device__ __forceinline S result(S r, double) const __device__ __forceinline__ S result(S r, double) const
{ {
return r; return r;
} }
...@@ -1838,7 +1838,7 @@ namespace cv { namespace gpu { namespace mathfunc ...@@ -1838,7 +1838,7 @@ namespace cv { namespace gpu { namespace mathfunc
return a + b; return a + b;
} }
__device__ __forceinline double result(S r, double sz) const __device__ __forceinline__ double result(S r, double sz) const
{ {
return r / sz; return r / sz;
} }
...@@ -1860,7 +1860,7 @@ namespace cv { namespace gpu { namespace mathfunc ...@@ -1860,7 +1860,7 @@ namespace cv { namespace gpu { namespace mathfunc
return ::fmin(a, b); return ::fmin(a, b);
} }
__device__ __forceinline S result(S r, double) const __device__ __forceinline__ S result(S r, double) const
{ {
return r; return r;
} }
...@@ -1882,7 +1882,7 @@ namespace cv { namespace gpu { namespace mathfunc ...@@ -1882,7 +1882,7 @@ namespace cv { namespace gpu { namespace mathfunc
return ::fmax(a, b); return ::fmax(a, b);
} }
__device__ __forceinline S result(S r, double) const __device__ __forceinline__ S result(S r, double) const
{ {
return r; return r;
} }
...@@ -2101,4 +2101,4 @@ namespace cv { namespace gpu { namespace mathfunc ...@@ -2101,4 +2101,4 @@ namespace cv { namespace gpu { namespace mathfunc
template void reduceCols_gpu<int, int, float>(const DevMem2D& src, int cn, const DevMem2D& dst, int reduceOp, cudaStream_t stream); template void reduceCols_gpu<int, int, float>(const DevMem2D& src, int cn, const DevMem2D& dst, int reduceOp, cudaStream_t stream);
template void reduceCols_gpu<float, float, float>(const DevMem2D& src, int cn, const DevMem2D& dst, int reduceOp, cudaStream_t stream); template void reduceCols_gpu<float, float, float>(const DevMem2D& src, int cn, const DevMem2D& dst, int reduceOp, cudaStream_t stream);
}}} }}}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment