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

fix windows build with CUDA

Browse Source 
rename cv::cuda::internal namespace
to cv::cuda::device to prevent conflicts
with cv::internal
This commit is contained in:
Vladislav Vinogradov 2015-02-17 21:50:39 +03:00
parent d1a15097fe
commit 671b59aa9d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cudaarithm/src/cuda/minmax.cu
View File

@ -134,7 +134,7 @@ void cv::cuda::minMax(InputArray _src, double* minVal, double* maxVal, InputArra
*maxVal = vals[1]; *maxVal = vals[1];
} }
namespace cv { namespace cuda { namespace internal { namespace cv { namespace cuda { namespace device {
void findMaxAbs(InputArray _src, OutputArray _dst, InputArray _mask, Stream& stream); void findMaxAbs(InputArray _src, OutputArray _dst, InputArray _mask, Stream& stream);
@ -155,7 +155,7 @@ namespace
} }
} }
void cv::cuda::internal::findMaxAbs(InputArray _src, OutputArray _dst, InputArray _mask, Stream& stream) void cv::cuda::device::findMaxAbs(InputArray _src, OutputArray _dst, InputArray _mask, Stream& stream)
{ {
typedef void (*func_t)(const GpuMat& _src, const GpuMat& mask, GpuMat& _dst, Stream& stream); typedef void (*func_t)(const GpuMat& _src, const GpuMat& mask, GpuMat& _dst, Stream& stream);
static const func_t funcs[] = static const func_t funcs[] =

4
modules/cudaarithm/src/cuda/norm.cu
View File

@ -128,7 +128,7 @@ double cv::cuda::norm(InputArray _src1, InputArray _src2, int normType)
return val; return val;
} }
namespace cv { namespace cuda { namespace internal { namespace cv { namespace cuda { namespace device {
void normL2(cv::InputArray _src, cv::OutputArray _dst, cv::InputArray _mask, Stream& stream); void normL2(cv::InputArray _src, cv::OutputArray _dst, cv::InputArray _mask, Stream& stream);
@ -158,7 +158,7 @@ namespace
} }
} }
void cv::cuda::internal::normL2(InputArray _src, OutputArray _dst, InputArray _mask, Stream& stream) void cv::cuda::device::normL2(InputArray _src, OutputArray _dst, InputArray _mask, Stream& stream)
{ {
typedef void (*func_t)(const GpuMat& _src, const GpuMat& mask, GpuMat& _dst, Stream& stream); typedef void (*func_t)(const GpuMat& _src, const GpuMat& mask, GpuMat& _dst, Stream& stream);
static const func_t funcs[] = static const func_t funcs[] =

6
modules/cudaarithm/src/reductions.cpp
View File

@ -84,7 +84,7 @@ void cv::cuda::sqrIntegral(InputArray, OutputArray, Stream&) { throw_no_cuda();
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// norm // norm
namespace cv { namespace cuda { namespace internal { namespace cv { namespace cuda { namespace device {
void normL2(cv::InputArray _src, cv::OutputArray _dst, cv::InputArray _mask, Stream& stream); void normL2(cv::InputArray _src, cv::OutputArray _dst, cv::InputArray _mask, Stream& stream);
@ -106,11 +106,11 @@ void cv::cuda::calcNorm(InputArray _src, OutputArray dst, int normType, InputArr
} }
else if (normType == NORM_L2) else if (normType == NORM_L2)
{ {
cv::cuda::internal::normL2(src_single_channel, dst, mask, stream); cv::cuda::device::normL2(src_single_channel, dst, mask, stream);
} }
else // NORM_INF else // NORM_INF
{ {
cv::cuda::internal::findMaxAbs(src_single_channel, dst, mask, stream); cv::cuda::device::findMaxAbs(src_single_channel, dst, mask, stream);
} }
} }