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

fixed build under linux

Browse Source
This commit is contained in:
Vladislav Vinogradov 2011-09-28 12:08:17 +00:00
parent 9da6d78989
commit f536dfa439
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gpu/src/cuda/matrix_reductions.cu
View File

@ -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
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
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
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
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);
}}} }}}