From 2838ccc78ea9726116ecd0ce550bcbebb8881dfb Mon Sep 17 00:00:00 2001 From: Alex Torres Date: Tue, 28 Jul 2015 15:49:24 -0300 Subject: [PATCH] Fixes compilation errors when BUILD_CUDA_STUBS is ON --- modules/cudaimgproc/src/histogram.cpp | 8 ++++---- modules/cudaoptflow/src/farneback.cpp | 2 +- modules/cudaoptflow/src/pyrlk.cpp | 2 +- modules/cudaoptflow/src/tvl1flow.cpp | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/cudaimgproc/src/histogram.cpp b/modules/cudaimgproc/src/histogram.cpp index 0ccce205a..59aa83343 100644 --- a/modules/cudaimgproc/src/histogram.cpp +++ b/modules/cudaimgproc/src/histogram.cpp @@ -55,11 +55,11 @@ cv::Ptr cv::cuda::createCLAHE(double, cv::Size) { throw_no_cuda void cv::cuda::evenLevels(OutputArray, int, int, int, Stream&) { throw_no_cuda(); } -void cv::cuda::histEven(InputArray, OutputArray, InputOutputArray, int, int, int, Stream&) { throw_no_cuda(); } -void cv::cuda::histEven(InputArray, GpuMat*, InputOutputArray, int*, int*, int*, Stream&) { throw_no_cuda(); } +void cv::cuda::histEven(InputArray, OutputArray, int, int, int, Stream&) { throw_no_cuda(); } +void cv::cuda::histEven(InputArray, GpuMat*, int*, int*, int*, Stream&) { throw_no_cuda(); } -void cv::cuda::histRange(InputArray, OutputArray, InputArray, InputOutputArray, Stream&) { throw_no_cuda(); } -void cv::cuda::histRange(InputArray, GpuMat*, const GpuMat*, InputOutputArray, Stream&) { throw_no_cuda(); } +void cv::cuda::histRange(InputArray, OutputArray, InputArray, Stream&) { throw_no_cuda(); } +void cv::cuda::histRange(InputArray, GpuMat*, const GpuMat*, Stream&) { throw_no_cuda(); } #else /* !defined (HAVE_CUDA) */ diff --git a/modules/cudaoptflow/src/farneback.cpp b/modules/cudaoptflow/src/farneback.cpp index b7fefeb19..fb62df686 100644 --- a/modules/cudaoptflow/src/farneback.cpp +++ b/modules/cudaoptflow/src/farneback.cpp @@ -47,7 +47,7 @@ using namespace cv::cuda; #if !defined HAVE_CUDA || defined(CUDA_DISABLER) -Ptr cv::cuda::FarnebackOpticalFlow::create(int, double, bool, int, int, int, double, int) { throw_no_cuda(); return Ptr(); } +Ptr cv::cuda::FarnebackOpticalFlow::create(int, double, bool, int, int, int, double, int) { throw_no_cuda(); return Ptr(); } #else diff --git a/modules/cudaoptflow/src/pyrlk.cpp b/modules/cudaoptflow/src/pyrlk.cpp index f4182743c..9d7db0a43 100644 --- a/modules/cudaoptflow/src/pyrlk.cpp +++ b/modules/cudaoptflow/src/pyrlk.cpp @@ -49,7 +49,7 @@ using namespace cv::cuda; Ptr cv::cuda::SparsePyrLKOpticalFlow::create(Size, int, int, bool) { throw_no_cuda(); return Ptr(); } -Ptr cv::cuda::DensePyrLKOpticalFlow::create(Size, int, int, bool) { throw_no_cuda(); return Ptr(); } +Ptr cv::cuda::DensePyrLKOpticalFlow::create(Size, int, int, bool) { throw_no_cuda(); return Ptr(); } #else /* !defined (HAVE_CUDA) */ diff --git a/modules/cudaoptflow/src/tvl1flow.cpp b/modules/cudaoptflow/src/tvl1flow.cpp index e2ef07b0d..22ce84543 100644 --- a/modules/cudaoptflow/src/tvl1flow.cpp +++ b/modules/cudaoptflow/src/tvl1flow.cpp @@ -42,15 +42,15 @@ #include "precomp.hpp" +using namespace cv; +using namespace cv::cuda; + #if !defined HAVE_CUDA || defined(CUDA_DISABLER) Ptr cv::cuda::OpticalFlowDual_TVL1::create(double, double, double, int, int, double, int, double, double, bool) { throw_no_cuda(); return Ptr(); } #else -using namespace cv; -using namespace cv::cuda; - namespace tvl1flow { void centeredGradient(PtrStepSzf src, PtrStepSzf dx, PtrStepSzf dy, cudaStream_t stream);