Merge pull request #3868 from Dikay900:fix_cudalegacy_without_cudaimgproc

b1238708 · Vadim Pisarevsky · eff302a2 · 3465cef6 · b1238708 · b1238708
Commit b1238708 authored Mar 26, 2015 by Vadim Pisarevsky
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

bm_fast.cpp modules/cudalegacy/src/bm_fast.cpp +1 -1

needle_map.cpp modules/cudalegacy/src/needle_map.cpp +1 -1

No files found.
--- 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(); }