From 5660d6a6804bbfc8a6b6b8fbaecd6a6349d9fcf5 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Tue, 23 Jul 2013 17:04:38 +0400 Subject: [PATCH] renamed gpuoptflow -> cudaoptflow --- modules/cudaoptflow/CMakeLists.txt | 9 +++++++++ .../gpuoptflow.rst => cudaoptflow/doc/cudaoptflow.rst} | 0 modules/{gpuoptflow => cudaoptflow}/doc/optflow.rst | 0 .../include/opencv2/cudaoptflow.hpp} | 8 ++++---- modules/{gpuoptflow => cudaoptflow}/perf/perf_main.cpp | 2 +- .../{gpuoptflow => cudaoptflow}/perf/perf_optflow.cpp | 0 .../{gpuoptflow => cudaoptflow}/perf/perf_precomp.cpp | 0 .../{gpuoptflow => cudaoptflow}/perf/perf_precomp.hpp | 2 +- modules/{gpuoptflow => cudaoptflow}/src/bm.cpp | 0 modules/{gpuoptflow => cudaoptflow}/src/bm_fast.cpp | 0 modules/{gpuoptflow => cudaoptflow}/src/brox.cpp | 0 modules/{gpuoptflow => cudaoptflow}/src/cuda/bm.cu | 0 modules/{gpuoptflow => cudaoptflow}/src/cuda/bm_fast.cu | 0 .../{gpuoptflow => cudaoptflow}/src/cuda/farneback.cu | 0 .../{gpuoptflow => cudaoptflow}/src/cuda/needle_map.cu | 0 modules/{gpuoptflow => cudaoptflow}/src/cuda/pyrlk.cu | 0 modules/{gpuoptflow => cudaoptflow}/src/cuda/tvl1flow.cu | 0 modules/{gpuoptflow => cudaoptflow}/src/farneback.cpp | 0 .../src/interpolate_frames.cpp | 0 modules/{gpuoptflow => cudaoptflow}/src/needle_map.cpp | 0 modules/{gpuoptflow => cudaoptflow}/src/precomp.cpp | 0 modules/{gpuoptflow => cudaoptflow}/src/precomp.hpp | 2 +- modules/{gpuoptflow => cudaoptflow}/src/pyrlk.cpp | 0 modules/{gpuoptflow => cudaoptflow}/src/tvl1flow.cpp | 0 modules/{gpuoptflow => cudaoptflow}/test/test_main.cpp | 0 .../{gpuoptflow => cudaoptflow}/test/test_optflow.cpp | 0 .../{gpuoptflow => cudaoptflow}/test/test_precomp.cpp | 0 .../{gpuoptflow => cudaoptflow}/test/test_precomp.hpp | 2 +- modules/gpuoptflow/CMakeLists.txt | 9 --------- modules/superres/CMakeLists.txt | 2 +- modules/superres/src/btv_l1_gpu.cpp | 2 +- modules/superres/src/optical_flow.cpp | 6 +++--- modules/superres/src/precomp.hpp | 4 ++-- modules/videostab/CMakeLists.txt | 2 +- .../include/opencv2/videostab/global_motion.hpp | 4 ++-- .../videostab/include/opencv2/videostab/optical_flow.hpp | 6 +++--- modules/videostab/src/global_motion.cpp | 4 ++-- modules/videostab/src/inpainting.cpp | 2 +- modules/videostab/src/optical_flow.cpp | 4 ++-- samples/cpp/CMakeLists.txt | 4 ++-- samples/cpp/videostab.cpp | 4 ++-- samples/gpu/CMakeLists.txt | 2 +- samples/gpu/brox_optical_flow.cpp | 2 +- samples/gpu/farneback_optical_flow.cpp | 2 +- samples/gpu/optical_flow.cpp | 2 +- samples/gpu/performance/tests.cpp | 2 +- samples/gpu/pyrlk_optical_flow.cpp | 2 +- 47 files changed, 45 insertions(+), 45 deletions(-) create mode 100644 modules/cudaoptflow/CMakeLists.txt rename modules/{gpuoptflow/doc/gpuoptflow.rst => cudaoptflow/doc/cudaoptflow.rst} (100%) rename modules/{gpuoptflow => cudaoptflow}/doc/optflow.rst (100%) rename modules/{gpuoptflow/include/opencv2/gpuoptflow.hpp => cudaoptflow/include/opencv2/cudaoptflow.hpp} (98%) rename modules/{gpuoptflow => cudaoptflow}/perf/perf_main.cpp (98%) rename modules/{gpuoptflow => cudaoptflow}/perf/perf_optflow.cpp (100%) rename modules/{gpuoptflow => cudaoptflow}/perf/perf_precomp.cpp (100%) rename modules/{gpuoptflow => cudaoptflow}/perf/perf_precomp.hpp (98%) rename modules/{gpuoptflow => cudaoptflow}/src/bm.cpp (100%) rename modules/{gpuoptflow => cudaoptflow}/src/bm_fast.cpp (100%) rename modules/{gpuoptflow => cudaoptflow}/src/brox.cpp (100%) rename modules/{gpuoptflow => cudaoptflow}/src/cuda/bm.cu (100%) rename modules/{gpuoptflow => cudaoptflow}/src/cuda/bm_fast.cu (100%) rename modules/{gpuoptflow => cudaoptflow}/src/cuda/farneback.cu (100%) rename modules/{gpuoptflow => cudaoptflow}/src/cuda/needle_map.cu (100%) rename modules/{gpuoptflow => cudaoptflow}/src/cuda/pyrlk.cu (100%) rename modules/{gpuoptflow => cudaoptflow}/src/cuda/tvl1flow.cu (100%) rename modules/{gpuoptflow => cudaoptflow}/src/farneback.cpp (100%) rename modules/{gpuoptflow => cudaoptflow}/src/interpolate_frames.cpp (100%) rename modules/{gpuoptflow => cudaoptflow}/src/needle_map.cpp (100%) rename modules/{gpuoptflow => cudaoptflow}/src/precomp.cpp (100%) rename modules/{gpuoptflow => cudaoptflow}/src/precomp.hpp (98%) rename modules/{gpuoptflow => cudaoptflow}/src/pyrlk.cpp (100%) rename modules/{gpuoptflow => cudaoptflow}/src/tvl1flow.cpp (100%) rename modules/{gpuoptflow => cudaoptflow}/test/test_main.cpp (100%) rename modules/{gpuoptflow => cudaoptflow}/test/test_optflow.cpp (100%) rename modules/{gpuoptflow => cudaoptflow}/test/test_precomp.cpp (100%) rename modules/{gpuoptflow => cudaoptflow}/test/test_precomp.hpp (98%) delete mode 100644 modules/gpuoptflow/CMakeLists.txt diff --git a/modules/cudaoptflow/CMakeLists.txt b/modules/cudaoptflow/CMakeLists.txt new file mode 100644 index 0000000000..c72fde0627 --- /dev/null +++ b/modules/cudaoptflow/CMakeLists.txt @@ -0,0 +1,9 @@ +if(ANDROID OR IOS) + ocv_module_disable(cudaoptflow) +endif() + +set(the_description "CUDA-accelerated Optical Flow") + +ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations) + +ocv_define_module(cudaoptflow opencv_video opencv_legacy opencv_cudaarithm opencv_cudawarping opencv_cudaimgproc OPTIONAL opencv_cudalegacy) diff --git a/modules/gpuoptflow/doc/gpuoptflow.rst b/modules/cudaoptflow/doc/cudaoptflow.rst similarity index 100% rename from modules/gpuoptflow/doc/gpuoptflow.rst rename to modules/cudaoptflow/doc/cudaoptflow.rst diff --git a/modules/gpuoptflow/doc/optflow.rst b/modules/cudaoptflow/doc/optflow.rst similarity index 100% rename from modules/gpuoptflow/doc/optflow.rst rename to modules/cudaoptflow/doc/optflow.rst diff --git a/modules/gpuoptflow/include/opencv2/gpuoptflow.hpp b/modules/cudaoptflow/include/opencv2/cudaoptflow.hpp similarity index 98% rename from modules/gpuoptflow/include/opencv2/gpuoptflow.hpp rename to modules/cudaoptflow/include/opencv2/cudaoptflow.hpp index 153bddee75..eb4a9524ac 100644 --- a/modules/gpuoptflow/include/opencv2/gpuoptflow.hpp +++ b/modules/cudaoptflow/include/opencv2/cudaoptflow.hpp @@ -40,11 +40,11 @@ // //M*/ -#ifndef __OPENCV_GPUOPTFLOW_HPP__ -#define __OPENCV_GPUOPTFLOW_HPP__ +#ifndef __OPENCV_CUDAOPTFLOW_HPP__ +#define __OPENCV_CUDAOPTFLOW_HPP__ #ifndef __cplusplus -# error gpuoptflow.hpp header must be compiled as C++ +# error cudaoptflow.hpp header must be compiled as C++ #endif #include "opencv2/core/cuda.hpp" @@ -308,4 +308,4 @@ CV_EXPORTS void createOpticalFlowNeedleMap(const GpuMat& u, const GpuMat& v, Gpu }} // namespace cv { namespace cuda { -#endif /* __OPENCV_GPUOPTFLOW_HPP__ */ +#endif /* __OPENCV_CUDAOPTFLOW_HPP__ */ diff --git a/modules/gpuoptflow/perf/perf_main.cpp b/modules/cudaoptflow/perf/perf_main.cpp similarity index 98% rename from modules/gpuoptflow/perf/perf_main.cpp rename to modules/cudaoptflow/perf/perf_main.cpp index e261932f8e..863a5109bf 100644 --- a/modules/gpuoptflow/perf/perf_main.cpp +++ b/modules/cudaoptflow/perf/perf_main.cpp @@ -44,4 +44,4 @@ using namespace perf; -CV_PERF_TEST_CUDA_MAIN(gpuoptflow) +CV_PERF_TEST_CUDA_MAIN(cudaoptflow) diff --git a/modules/gpuoptflow/perf/perf_optflow.cpp b/modules/cudaoptflow/perf/perf_optflow.cpp similarity index 100% rename from modules/gpuoptflow/perf/perf_optflow.cpp rename to modules/cudaoptflow/perf/perf_optflow.cpp diff --git a/modules/gpuoptflow/perf/perf_precomp.cpp b/modules/cudaoptflow/perf/perf_precomp.cpp similarity index 100% rename from modules/gpuoptflow/perf/perf_precomp.cpp rename to modules/cudaoptflow/perf/perf_precomp.cpp diff --git a/modules/gpuoptflow/perf/perf_precomp.hpp b/modules/cudaoptflow/perf/perf_precomp.hpp similarity index 98% rename from modules/gpuoptflow/perf/perf_precomp.hpp rename to modules/cudaoptflow/perf/perf_precomp.hpp index 9235b62dcd..9c70c196e4 100644 --- a/modules/gpuoptflow/perf/perf_precomp.hpp +++ b/modules/cudaoptflow/perf/perf_precomp.hpp @@ -54,7 +54,7 @@ #include "opencv2/ts.hpp" #include "opencv2/ts/gpu_perf.hpp" -#include "opencv2/gpuoptflow.hpp" +#include "opencv2/cudaoptflow.hpp" #include "opencv2/video.hpp" #ifdef GTEST_CREATE_SHARED_LIBRARY diff --git a/modules/gpuoptflow/src/bm.cpp b/modules/cudaoptflow/src/bm.cpp similarity index 100% rename from modules/gpuoptflow/src/bm.cpp rename to modules/cudaoptflow/src/bm.cpp diff --git a/modules/gpuoptflow/src/bm_fast.cpp b/modules/cudaoptflow/src/bm_fast.cpp similarity index 100% rename from modules/gpuoptflow/src/bm_fast.cpp rename to modules/cudaoptflow/src/bm_fast.cpp diff --git a/modules/gpuoptflow/src/brox.cpp b/modules/cudaoptflow/src/brox.cpp similarity index 100% rename from modules/gpuoptflow/src/brox.cpp rename to modules/cudaoptflow/src/brox.cpp diff --git a/modules/gpuoptflow/src/cuda/bm.cu b/modules/cudaoptflow/src/cuda/bm.cu similarity index 100% rename from modules/gpuoptflow/src/cuda/bm.cu rename to modules/cudaoptflow/src/cuda/bm.cu diff --git a/modules/gpuoptflow/src/cuda/bm_fast.cu b/modules/cudaoptflow/src/cuda/bm_fast.cu similarity index 100% rename from modules/gpuoptflow/src/cuda/bm_fast.cu rename to modules/cudaoptflow/src/cuda/bm_fast.cu diff --git a/modules/gpuoptflow/src/cuda/farneback.cu b/modules/cudaoptflow/src/cuda/farneback.cu similarity index 100% rename from modules/gpuoptflow/src/cuda/farneback.cu rename to modules/cudaoptflow/src/cuda/farneback.cu diff --git a/modules/gpuoptflow/src/cuda/needle_map.cu b/modules/cudaoptflow/src/cuda/needle_map.cu similarity index 100% rename from modules/gpuoptflow/src/cuda/needle_map.cu rename to modules/cudaoptflow/src/cuda/needle_map.cu diff --git a/modules/gpuoptflow/src/cuda/pyrlk.cu b/modules/cudaoptflow/src/cuda/pyrlk.cu similarity index 100% rename from modules/gpuoptflow/src/cuda/pyrlk.cu rename to modules/cudaoptflow/src/cuda/pyrlk.cu diff --git a/modules/gpuoptflow/src/cuda/tvl1flow.cu b/modules/cudaoptflow/src/cuda/tvl1flow.cu similarity index 100% rename from modules/gpuoptflow/src/cuda/tvl1flow.cu rename to modules/cudaoptflow/src/cuda/tvl1flow.cu diff --git a/modules/gpuoptflow/src/farneback.cpp b/modules/cudaoptflow/src/farneback.cpp similarity index 100% rename from modules/gpuoptflow/src/farneback.cpp rename to modules/cudaoptflow/src/farneback.cpp diff --git a/modules/gpuoptflow/src/interpolate_frames.cpp b/modules/cudaoptflow/src/interpolate_frames.cpp similarity index 100% rename from modules/gpuoptflow/src/interpolate_frames.cpp rename to modules/cudaoptflow/src/interpolate_frames.cpp diff --git a/modules/gpuoptflow/src/needle_map.cpp b/modules/cudaoptflow/src/needle_map.cpp similarity index 100% rename from modules/gpuoptflow/src/needle_map.cpp rename to modules/cudaoptflow/src/needle_map.cpp diff --git a/modules/gpuoptflow/src/precomp.cpp b/modules/cudaoptflow/src/precomp.cpp similarity index 100% rename from modules/gpuoptflow/src/precomp.cpp rename to modules/cudaoptflow/src/precomp.cpp diff --git a/modules/gpuoptflow/src/precomp.hpp b/modules/cudaoptflow/src/precomp.hpp similarity index 98% rename from modules/gpuoptflow/src/precomp.hpp rename to modules/cudaoptflow/src/precomp.hpp index 6eb7840fb9..3c818dd4e6 100644 --- a/modules/gpuoptflow/src/precomp.hpp +++ b/modules/cudaoptflow/src/precomp.hpp @@ -45,7 +45,7 @@ #include -#include "opencv2/gpuoptflow.hpp" +#include "opencv2/cudaoptflow.hpp" #include "opencv2/cudaarithm.hpp" #include "opencv2/cudawarping.hpp" #include "opencv2/cudaimgproc.hpp" diff --git a/modules/gpuoptflow/src/pyrlk.cpp b/modules/cudaoptflow/src/pyrlk.cpp similarity index 100% rename from modules/gpuoptflow/src/pyrlk.cpp rename to modules/cudaoptflow/src/pyrlk.cpp diff --git a/modules/gpuoptflow/src/tvl1flow.cpp b/modules/cudaoptflow/src/tvl1flow.cpp similarity index 100% rename from modules/gpuoptflow/src/tvl1flow.cpp rename to modules/cudaoptflow/src/tvl1flow.cpp diff --git a/modules/gpuoptflow/test/test_main.cpp b/modules/cudaoptflow/test/test_main.cpp similarity index 100% rename from modules/gpuoptflow/test/test_main.cpp rename to modules/cudaoptflow/test/test_main.cpp diff --git a/modules/gpuoptflow/test/test_optflow.cpp b/modules/cudaoptflow/test/test_optflow.cpp similarity index 100% rename from modules/gpuoptflow/test/test_optflow.cpp rename to modules/cudaoptflow/test/test_optflow.cpp diff --git a/modules/gpuoptflow/test/test_precomp.cpp b/modules/cudaoptflow/test/test_precomp.cpp similarity index 100% rename from modules/gpuoptflow/test/test_precomp.cpp rename to modules/cudaoptflow/test/test_precomp.cpp diff --git a/modules/gpuoptflow/test/test_precomp.hpp b/modules/cudaoptflow/test/test_precomp.hpp similarity index 98% rename from modules/gpuoptflow/test/test_precomp.hpp rename to modules/cudaoptflow/test/test_precomp.hpp index afac60d876..db9f1446ee 100644 --- a/modules/gpuoptflow/test/test_precomp.hpp +++ b/modules/cudaoptflow/test/test_precomp.hpp @@ -56,7 +56,7 @@ #include "opencv2/ts.hpp" #include "opencv2/ts/gpu_test.hpp" -#include "opencv2/gpuoptflow.hpp" +#include "opencv2/cudaoptflow.hpp" #include "opencv2/video.hpp" #include "cvconfig.h" diff --git a/modules/gpuoptflow/CMakeLists.txt b/modules/gpuoptflow/CMakeLists.txt deleted file mode 100644 index 4bd3631880..0000000000 --- a/modules/gpuoptflow/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -if(ANDROID OR IOS) - ocv_module_disable(gpuoptflow) -endif() - -set(the_description "GPU-accelerated Optical Flow") - -ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations) - -ocv_define_module(gpuoptflow opencv_video opencv_legacy opencv_cudaarithm opencv_cudawarping opencv_cudaimgproc OPTIONAL opencv_cudalegacy) diff --git a/modules/superres/CMakeLists.txt b/modules/superres/CMakeLists.txt index aec0ae1129..1182a3c0a3 100644 --- a/modules/superres/CMakeLists.txt +++ b/modules/superres/CMakeLists.txt @@ -6,4 +6,4 @@ set(the_description "Super Resolution") ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 -Wundef) ocv_define_module(superres opencv_imgproc opencv_video OPTIONAL opencv_highgui opencv_ocl - opencv_cudaarithm opencv_cudafilters opencv_cudawarping opencv_cudaimgproc opencv_gpuoptflow opencv_cudacodec) + opencv_cudaarithm opencv_cudafilters opencv_cudawarping opencv_cudaimgproc opencv_cudaoptflow opencv_cudacodec) diff --git a/modules/superres/src/btv_l1_gpu.cpp b/modules/superres/src/btv_l1_gpu.cpp index 2bbe5e4c80..57545e7724 100644 --- a/modules/superres/src/btv_l1_gpu.cpp +++ b/modules/superres/src/btv_l1_gpu.cpp @@ -267,7 +267,7 @@ namespace blurKernelSize_ = 5; blurSigma_ = 0.0; -#ifdef HAVE_OPENCV_GPUOPTFLOW +#ifdef HAVE_OPENCV_CUDAOPTFLOW opticalFlow_ = createOptFlow_Farneback_GPU(); #else opticalFlow_ = createOptFlow_Farneback(); diff --git a/modules/superres/src/optical_flow.cpp b/modules/superres/src/optical_flow.cpp index e33c54948b..491bfce2ca 100644 --- a/modules/superres/src/optical_flow.cpp +++ b/modules/superres/src/optical_flow.cpp @@ -343,7 +343,7 @@ Ptr cv::superres::createOptFlow_DualTVL1() /////////////////////////////////////////////////////////////////// // GpuOpticalFlow -#ifndef HAVE_OPENCV_GPUOPTFLOW +#ifndef HAVE_OPENCV_CUDAOPTFLOW Ptr cv::superres::createOptFlow_Farneback_GPU() { @@ -369,7 +369,7 @@ Ptr cv::superres::createOptFlow_PyrLK_GPU() return Ptr(); } -#else // HAVE_OPENCV_GPUOPTFLOW +#else // HAVE_OPENCV_CUDAOPTFLOW namespace { @@ -717,7 +717,7 @@ Ptr cv::superres::createOptFlow_DualTVL1_GPU() return new DualTVL1_GPU; } -#endif // HAVE_OPENCV_GPUOPTFLOW +#endif // HAVE_OPENCV_CUDAOPTFLOW #ifdef HAVE_OPENCV_OCL namespace diff --git a/modules/superres/src/precomp.hpp b/modules/superres/src/precomp.hpp index 7b0d070152..c5dbe2db29 100644 --- a/modules/superres/src/precomp.hpp +++ b/modules/superres/src/precomp.hpp @@ -73,8 +73,8 @@ # include "opencv2/cudaimgproc.hpp" #endif -#ifdef HAVE_OPENCV_GPUOPTFLOW -# include "opencv2/gpuoptflow.hpp" +#ifdef HAVE_OPENCV_CUDAOPTFLOW +# include "opencv2/cudaoptflow.hpp" #endif #ifdef HAVE_OPENCV_CUDACODEC diff --git a/modules/videostab/CMakeLists.txt b/modules/videostab/CMakeLists.txt index 9c57e56010..4f780bc0c9 100644 --- a/modules/videostab/CMakeLists.txt +++ b/modules/videostab/CMakeLists.txt @@ -1,3 +1,3 @@ set(the_description "Video stabilization") ocv_define_module(videostab opencv_imgproc opencv_features2d opencv_video opencv_photo opencv_calib3d - OPTIONAL opencv_gpu opencv_cudawarping opencv_gpuoptflow opencv_highgui) + OPTIONAL opencv_gpu opencv_cudawarping opencv_cudaoptflow opencv_highgui) diff --git a/modules/videostab/include/opencv2/videostab/global_motion.hpp b/modules/videostab/include/opencv2/videostab/global_motion.hpp index 3f26739be2..b71dd539df 100644 --- a/modules/videostab/include/opencv2/videostab/global_motion.hpp +++ b/modules/videostab/include/opencv2/videostab/global_motion.hpp @@ -199,7 +199,7 @@ private: std::vector pointsPrevGood_, pointsGood_; }; -#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW) +#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_CUDAOPTFLOW) class CV_EXPORTS KeypointBasedMotionEstimatorGpu : public ImageMotionEstimatorBase { @@ -230,7 +230,7 @@ private: std::vector rejectionStatus_; }; -#endif // defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW) +#endif // defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_CUDAOPTFLOW) CV_EXPORTS Mat getMotion(int from, int to, const std::vector &motions); diff --git a/modules/videostab/include/opencv2/videostab/optical_flow.hpp b/modules/videostab/include/opencv2/videostab/optical_flow.hpp index fc4efbf5a3..4a21f94649 100644 --- a/modules/videostab/include/opencv2/videostab/optical_flow.hpp +++ b/modules/videostab/include/opencv2/videostab/optical_flow.hpp @@ -46,8 +46,8 @@ #include "opencv2/core.hpp" #include "opencv2/opencv_modules.hpp" -#ifdef HAVE_OPENCV_GPUOPTFLOW - #include "opencv2/gpuoptflow.hpp" +#ifdef HAVE_OPENCV_CUDAOPTFLOW + #include "opencv2/cudaoptflow.hpp" #endif namespace cv @@ -99,7 +99,7 @@ public: OutputArray status, OutputArray errors); }; -#ifdef HAVE_OPENCV_GPUOPTFLOW +#ifdef HAVE_OPENCV_CUDAOPTFLOW class CV_EXPORTS SparsePyrLkOptFlowEstimatorGpu : public PyrLkOptFlowEstimatorBase, public ISparseOptFlowEstimator diff --git a/modules/videostab/src/global_motion.cpp b/modules/videostab/src/global_motion.cpp index 620d8dff5f..c8c01af00a 100644 --- a/modules/videostab/src/global_motion.cpp +++ b/modules/videostab/src/global_motion.cpp @@ -737,7 +737,7 @@ Mat KeypointBasedMotionEstimator::estimate(const Mat &frame0, const Mat &frame1, } -#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW) +#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_CUDAOPTFLOW) KeypointBasedMotionEstimatorGpu::KeypointBasedMotionEstimatorGpu(Ptr estimator) : ImageMotionEstimatorBase(estimator->motionModel()), motionEstimator_(estimator) @@ -812,7 +812,7 @@ Mat KeypointBasedMotionEstimatorGpu::estimate(const cuda::GpuMat &frame0, const return motionEstimator_->estimate(hostPointsPrev_, hostPoints_, ok); } -#endif // defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW) +#endif // defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_CUDAOPTFLOW) Mat getMotion(int from, int to, const std::vector &motions) diff --git a/modules/videostab/src/inpainting.cpp b/modules/videostab/src/inpainting.cpp index b3092048fa..d2194382b7 100644 --- a/modules/videostab/src/inpainting.cpp +++ b/modules/videostab/src/inpainting.cpp @@ -323,7 +323,7 @@ public: MotionInpainter::MotionInpainter() { -#ifdef HAVE_OPENCV_GPUOPTFLOW +#ifdef HAVE_OPENCV_CUDAOPTFLOW setOptFlowEstimator(new DensePyrLkOptFlowEstimatorGpu()); #else CV_Error(Error::StsNotImplemented, "Current implementation of MotionInpainter requires GPU"); diff --git a/modules/videostab/src/optical_flow.cpp b/modules/videostab/src/optical_flow.cpp index 922c1e2426..d8a059c1fd 100644 --- a/modules/videostab/src/optical_flow.cpp +++ b/modules/videostab/src/optical_flow.cpp @@ -58,7 +58,7 @@ void SparsePyrLkOptFlowEstimator::run( } -#ifdef HAVE_OPENCV_GPUOPTFLOW +#ifdef HAVE_OPENCV_CUDAOPTFLOW SparsePyrLkOptFlowEstimatorGpu::SparsePyrLkOptFlowEstimatorGpu() { @@ -135,7 +135,7 @@ void DensePyrLkOptFlowEstimatorGpu::run( flowY_.download(flowY.getMatRef()); } -#endif // HAVE_OPENCV_GPUOPTFLOW +#endif // HAVE_OPENCV_CUDAOPTFLOW } // namespace videostab } // namespace cv diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt index 5f838ca902..5b3e5f05e5 100644 --- a/samples/cpp/CMakeLists.txt +++ b/samples/cpp/CMakeLists.txt @@ -16,8 +16,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) ocv_include_directories("${OpenCV_SOURCE_DIR}/include")#for opencv.hpp ocv_include_modules(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS}) - if(HAVE_opencv_gpuoptflow) - ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpuoptflow/include") + if(HAVE_opencv_cudaoptflow) + ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/cudaoptflow/include") endif() if(HAVE_opencv_cudaimgproc) ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/cudaimgproc/include") diff --git a/samples/cpp/videostab.cpp b/samples/cpp/videostab.cpp index 0392ef5070..538dac12e8 100644 --- a/samples/cpp/videostab.cpp +++ b/samples/cpp/videostab.cpp @@ -216,7 +216,7 @@ public: outlierRejector = tblor; } -#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW) +#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_CUDAOPTFLOW) if (gpu) { KeypointBasedMotionEstimatorGpu *kbest = new KeypointBasedMotionEstimatorGpu(est); @@ -257,7 +257,7 @@ public: outlierRejector = tblor; } -#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW) +#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_CUDAOPTFLOW) if (gpu) { KeypointBasedMotionEstimatorGpu *kbest = new KeypointBasedMotionEstimatorGpu(est); diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt index 1116a8f384..abf80565f5 100644 --- a/samples/gpu/CMakeLists.txt +++ b/samples/gpu/CMakeLists.txt @@ -3,7 +3,7 @@ SET(OPENCV_GPU_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc ope opencv_calib3d opencv_legacy opencv_contrib opencv_gpu opencv_nonfree opencv_softcascade opencv_superres opencv_cudaarithm opencv_cudafilters opencv_cudawarping opencv_cudaimgproc - opencv_gpufeatures2d opencv_gpuoptflow opencv_gpubgsegm + opencv_gpufeatures2d opencv_cudaoptflow opencv_gpubgsegm opencv_cudastereo opencv_cudalegacy) ocv_check_dependencies(${OPENCV_GPU_SAMPLES_REQUIRED_DEPS}) diff --git a/samples/gpu/brox_optical_flow.cpp b/samples/gpu/brox_optical_flow.cpp index 4a82cef822..08973861f9 100644 --- a/samples/gpu/brox_optical_flow.cpp +++ b/samples/gpu/brox_optical_flow.cpp @@ -7,7 +7,7 @@ #include "opencv2/core/utility.hpp" #include "opencv2/highgui.hpp" #include "opencv2/imgproc.hpp" -#include "opencv2/gpuoptflow.hpp" +#include "opencv2/cudaoptflow.hpp" #include "opencv2/cudaarithm.hpp" using namespace std; diff --git a/samples/gpu/farneback_optical_flow.cpp b/samples/gpu/farneback_optical_flow.cpp index d90acd75f8..6fc3f931fe 100644 --- a/samples/gpu/farneback_optical_flow.cpp +++ b/samples/gpu/farneback_optical_flow.cpp @@ -6,7 +6,7 @@ #include "opencv2/core/utility.hpp" #include "opencv2/highgui.hpp" #include "opencv2/video.hpp" -#include "opencv2/gpuoptflow.hpp" +#include "opencv2/cudaoptflow.hpp" using namespace std; using namespace cv; diff --git a/samples/gpu/optical_flow.cpp b/samples/gpu/optical_flow.cpp index 63b93fe729..786dd862b6 100644 --- a/samples/gpu/optical_flow.cpp +++ b/samples/gpu/optical_flow.cpp @@ -4,7 +4,7 @@ #include "opencv2/core.hpp" #include #include "opencv2/highgui.hpp" -#include "opencv2/gpuoptflow.hpp" +#include "opencv2/cudaoptflow.hpp" using namespace std; using namespace cv; diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp index df0d65acf1..0498b07ea0 100644 --- a/samples/gpu/performance/tests.cpp +++ b/samples/gpu/performance/tests.cpp @@ -9,7 +9,7 @@ #include "opencv2/cudawarping.hpp" #include "opencv2/gpufeatures2d.hpp" #include "opencv2/cudafilters.hpp" -#include "opencv2/gpuoptflow.hpp" +#include "opencv2/cudaoptflow.hpp" #include "opencv2/gpubgsegm.hpp" #include "opencv2/legacy.hpp" diff --git a/samples/gpu/pyrlk_optical_flow.cpp b/samples/gpu/pyrlk_optical_flow.cpp index a1f22b3a7d..dc5de6c0aa 100644 --- a/samples/gpu/pyrlk_optical_flow.cpp +++ b/samples/gpu/pyrlk_optical_flow.cpp @@ -6,7 +6,7 @@ #include "opencv2/imgproc.hpp" #include "opencv2/highgui.hpp" #include "opencv2/video.hpp" -#include "opencv2/gpuoptflow.hpp" +#include "opencv2/cudaoptflow.hpp" #include "opencv2/cudaimgproc.hpp" using namespace std;