Merge pull request #3868 from Dikay900:fix_cudalegacy_without_cudaimgproc

10 years ago · b123870871
parent eff302a231 3465cef689
commit b123870871
2 changed files with 2 additions and 2 deletions
--- a/modules/cudalegacy/src/bm_fast.cpp
+++ b/modules/cudalegacy/src/bm_fast.cpp
@ -45,7 +45,7 @@
 using namespace cv;
 using namespace cv::cuda;

-#if !defined HAVE_CUDA || defined(CUDA_DISABLER)
+#if !defined HAVE_CUDA || !defined(HAVE_OPENCV_CUDAARITHM) || defined(CUDA_DISABLER)

 void cv::cuda::FastOpticalFlowBM::operator ()(const GpuMat&, const GpuMat&, GpuMat&, GpuMat&, int, int, Stream&) { throw_no_cuda(); }

--- a/modules/cudalegacy/src/needle_map.cpp
+++ b/modules/cudalegacy/src/needle_map.cpp
@ -45,7 +45,7 @@
 using namespace cv;
 using namespace cv::cuda;

-#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER)
+#if !defined (HAVE_CUDA) || !defined(HAVE_OPENCV_CUDAIMGPROC) || defined (CUDA_DISABLER)

 void cv::cuda::createOpticalFlowNeedleMap(const GpuMat&, const GpuMat&, GpuMat&, GpuMat&) { throw_no_cuda(); }