diff --git a/modules/cudafilters/CMakeLists.txt b/modules/cudafilters/CMakeLists.txt new file mode 100644 index 0000000000..35b943274d --- /dev/null +++ b/modules/cudafilters/CMakeLists.txt @@ -0,0 +1,9 @@ +if(ANDROID OR IOS) + ocv_module_disable(cudafilters) +endif() + +set(the_description "CUDA-accelerated Image Filtering") + +ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations) + +ocv_define_module(cudafilters opencv_imgproc opencv_cudaarithm) diff --git a/modules/gpufilters/doc/gpufilters.rst b/modules/cudafilters/doc/cudafilters.rst similarity index 100% rename from modules/gpufilters/doc/gpufilters.rst rename to modules/cudafilters/doc/cudafilters.rst diff --git a/modules/gpufilters/doc/filtering.rst b/modules/cudafilters/doc/filtering.rst similarity index 100% rename from modules/gpufilters/doc/filtering.rst rename to modules/cudafilters/doc/filtering.rst diff --git a/modules/gpufilters/include/opencv2/gpufilters.hpp b/modules/cudafilters/include/opencv2/cudafilters.hpp similarity index 97% rename from modules/gpufilters/include/opencv2/gpufilters.hpp rename to modules/cudafilters/include/opencv2/cudafilters.hpp index 0b54be31b3..2c06575b5d 100644 --- a/modules/gpufilters/include/opencv2/gpufilters.hpp +++ b/modules/cudafilters/include/opencv2/cudafilters.hpp @@ -40,11 +40,11 @@ // //M*/ -#ifndef __OPENCV_GPUFILTERS_HPP__ -#define __OPENCV_GPUFILTERS_HPP__ +#ifndef __OPENCV_CUDAFILTERS_HPP__ +#define __OPENCV_CUDAFILTERS_HPP__ #ifndef __cplusplus -# error gpufilters.hpp header must be compiled as C++ +# error cudafilters.hpp header must be compiled as C++ #endif #include "opencv2/core/cuda.hpp" @@ -146,4 +146,4 @@ CV_EXPORTS Ptr createColumnSumFilter(int srcType, int dstType, int ksize }} // namespace cv { namespace cuda { -#endif /* __OPENCV_GPUFILTERS_HPP__ */ +#endif /* __OPENCV_CUDAFILTERS_HPP__ */ diff --git a/modules/gpufilters/perf/perf_filters.cpp b/modules/cudafilters/perf/perf_filters.cpp similarity index 100% rename from modules/gpufilters/perf/perf_filters.cpp rename to modules/cudafilters/perf/perf_filters.cpp diff --git a/modules/gpufilters/perf/perf_main.cpp b/modules/cudafilters/perf/perf_main.cpp similarity index 98% rename from modules/gpufilters/perf/perf_main.cpp rename to modules/cudafilters/perf/perf_main.cpp index 44b3129e1f..b49b524248 100644 --- a/modules/gpufilters/perf/perf_main.cpp +++ b/modules/cudafilters/perf/perf_main.cpp @@ -44,4 +44,4 @@ using namespace perf; -CV_PERF_TEST_CUDA_MAIN(gpufilters) +CV_PERF_TEST_CUDA_MAIN(cudafilters) diff --git a/modules/gpufilters/perf/perf_precomp.cpp b/modules/cudafilters/perf/perf_precomp.cpp similarity index 100% rename from modules/gpufilters/perf/perf_precomp.cpp rename to modules/cudafilters/perf/perf_precomp.cpp diff --git a/modules/gpufilters/perf/perf_precomp.hpp b/modules/cudafilters/perf/perf_precomp.hpp similarity index 98% rename from modules/gpufilters/perf/perf_precomp.hpp rename to modules/cudafilters/perf/perf_precomp.hpp index 02ca5ceacb..1cfe487cee 100644 --- a/modules/gpufilters/perf/perf_precomp.hpp +++ b/modules/cudafilters/perf/perf_precomp.hpp @@ -54,7 +54,7 @@ #include "opencv2/ts.hpp" #include "opencv2/ts/gpu_perf.hpp" -#include "opencv2/gpufilters.hpp" +#include "opencv2/cudafilters.hpp" #include "opencv2/imgproc.hpp" #ifdef GTEST_CREATE_SHARED_LIBRARY diff --git a/modules/gpufilters/src/cuda/column_filter.16sc1.cu b/modules/cudafilters/src/cuda/column_filter.16sc1.cu similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.16sc1.cu rename to modules/cudafilters/src/cuda/column_filter.16sc1.cu diff --git a/modules/gpufilters/src/cuda/column_filter.16sc3.cu b/modules/cudafilters/src/cuda/column_filter.16sc3.cu similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.16sc3.cu rename to modules/cudafilters/src/cuda/column_filter.16sc3.cu diff --git a/modules/gpufilters/src/cuda/column_filter.16sc4.cu b/modules/cudafilters/src/cuda/column_filter.16sc4.cu similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.16sc4.cu rename to modules/cudafilters/src/cuda/column_filter.16sc4.cu diff --git a/modules/gpufilters/src/cuda/column_filter.16uc1.cu b/modules/cudafilters/src/cuda/column_filter.16uc1.cu similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.16uc1.cu rename to modules/cudafilters/src/cuda/column_filter.16uc1.cu diff --git a/modules/gpufilters/src/cuda/column_filter.16uc3.cu b/modules/cudafilters/src/cuda/column_filter.16uc3.cu similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.16uc3.cu rename to modules/cudafilters/src/cuda/column_filter.16uc3.cu diff --git a/modules/gpufilters/src/cuda/column_filter.16uc4.cu b/modules/cudafilters/src/cuda/column_filter.16uc4.cu similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.16uc4.cu rename to modules/cudafilters/src/cuda/column_filter.16uc4.cu diff --git a/modules/gpufilters/src/cuda/column_filter.32fc1.cu b/modules/cudafilters/src/cuda/column_filter.32fc1.cu similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.32fc1.cu rename to modules/cudafilters/src/cuda/column_filter.32fc1.cu diff --git a/modules/gpufilters/src/cuda/column_filter.32fc3.cu b/modules/cudafilters/src/cuda/column_filter.32fc3.cu similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.32fc3.cu rename to modules/cudafilters/src/cuda/column_filter.32fc3.cu diff --git a/modules/gpufilters/src/cuda/column_filter.32fc4.cu b/modules/cudafilters/src/cuda/column_filter.32fc4.cu similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.32fc4.cu rename to modules/cudafilters/src/cuda/column_filter.32fc4.cu diff --git a/modules/gpufilters/src/cuda/column_filter.32sc1.cu b/modules/cudafilters/src/cuda/column_filter.32sc1.cu similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.32sc1.cu rename to modules/cudafilters/src/cuda/column_filter.32sc1.cu diff --git a/modules/gpufilters/src/cuda/column_filter.32sc3.cu b/modules/cudafilters/src/cuda/column_filter.32sc3.cu similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.32sc3.cu rename to modules/cudafilters/src/cuda/column_filter.32sc3.cu diff --git a/modules/gpufilters/src/cuda/column_filter.32sc4.cu b/modules/cudafilters/src/cuda/column_filter.32sc4.cu similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.32sc4.cu rename to modules/cudafilters/src/cuda/column_filter.32sc4.cu diff --git a/modules/gpufilters/src/cuda/column_filter.8uc1.cu b/modules/cudafilters/src/cuda/column_filter.8uc1.cu similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.8uc1.cu rename to modules/cudafilters/src/cuda/column_filter.8uc1.cu diff --git a/modules/gpufilters/src/cuda/column_filter.8uc3.cu b/modules/cudafilters/src/cuda/column_filter.8uc3.cu similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.8uc3.cu rename to modules/cudafilters/src/cuda/column_filter.8uc3.cu diff --git a/modules/gpufilters/src/cuda/column_filter.8uc4.cu b/modules/cudafilters/src/cuda/column_filter.8uc4.cu similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.8uc4.cu rename to modules/cudafilters/src/cuda/column_filter.8uc4.cu diff --git a/modules/gpufilters/src/cuda/column_filter.hpp b/modules/cudafilters/src/cuda/column_filter.hpp similarity index 100% rename from modules/gpufilters/src/cuda/column_filter.hpp rename to modules/cudafilters/src/cuda/column_filter.hpp diff --git a/modules/gpufilters/src/cuda/filter2d.cu b/modules/cudafilters/src/cuda/filter2d.cu similarity index 100% rename from modules/gpufilters/src/cuda/filter2d.cu rename to modules/cudafilters/src/cuda/filter2d.cu diff --git a/modules/gpufilters/src/cuda/row_filter.16sc1.cu b/modules/cudafilters/src/cuda/row_filter.16sc1.cu similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.16sc1.cu rename to modules/cudafilters/src/cuda/row_filter.16sc1.cu diff --git a/modules/gpufilters/src/cuda/row_filter.16sc3.cu b/modules/cudafilters/src/cuda/row_filter.16sc3.cu similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.16sc3.cu rename to modules/cudafilters/src/cuda/row_filter.16sc3.cu diff --git a/modules/gpufilters/src/cuda/row_filter.16sc4.cu b/modules/cudafilters/src/cuda/row_filter.16sc4.cu similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.16sc4.cu rename to modules/cudafilters/src/cuda/row_filter.16sc4.cu diff --git a/modules/gpufilters/src/cuda/row_filter.16uc1.cu b/modules/cudafilters/src/cuda/row_filter.16uc1.cu similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.16uc1.cu rename to modules/cudafilters/src/cuda/row_filter.16uc1.cu diff --git a/modules/gpufilters/src/cuda/row_filter.16uc3.cu b/modules/cudafilters/src/cuda/row_filter.16uc3.cu similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.16uc3.cu rename to modules/cudafilters/src/cuda/row_filter.16uc3.cu diff --git a/modules/gpufilters/src/cuda/row_filter.16uc4.cu b/modules/cudafilters/src/cuda/row_filter.16uc4.cu similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.16uc4.cu rename to modules/cudafilters/src/cuda/row_filter.16uc4.cu diff --git a/modules/gpufilters/src/cuda/row_filter.32fc1.cu b/modules/cudafilters/src/cuda/row_filter.32fc1.cu similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.32fc1.cu rename to modules/cudafilters/src/cuda/row_filter.32fc1.cu diff --git a/modules/gpufilters/src/cuda/row_filter.32fc3.cu b/modules/cudafilters/src/cuda/row_filter.32fc3.cu similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.32fc3.cu rename to modules/cudafilters/src/cuda/row_filter.32fc3.cu diff --git a/modules/gpufilters/src/cuda/row_filter.32fc4.cu b/modules/cudafilters/src/cuda/row_filter.32fc4.cu similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.32fc4.cu rename to modules/cudafilters/src/cuda/row_filter.32fc4.cu diff --git a/modules/gpufilters/src/cuda/row_filter.32sc1.cu b/modules/cudafilters/src/cuda/row_filter.32sc1.cu similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.32sc1.cu rename to modules/cudafilters/src/cuda/row_filter.32sc1.cu diff --git a/modules/gpufilters/src/cuda/row_filter.32sc3.cu b/modules/cudafilters/src/cuda/row_filter.32sc3.cu similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.32sc3.cu rename to modules/cudafilters/src/cuda/row_filter.32sc3.cu diff --git a/modules/gpufilters/src/cuda/row_filter.32sc4.cu b/modules/cudafilters/src/cuda/row_filter.32sc4.cu similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.32sc4.cu rename to modules/cudafilters/src/cuda/row_filter.32sc4.cu diff --git a/modules/gpufilters/src/cuda/row_filter.8uc1.cu b/modules/cudafilters/src/cuda/row_filter.8uc1.cu similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.8uc1.cu rename to modules/cudafilters/src/cuda/row_filter.8uc1.cu diff --git a/modules/gpufilters/src/cuda/row_filter.8uc3.cu b/modules/cudafilters/src/cuda/row_filter.8uc3.cu similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.8uc3.cu rename to modules/cudafilters/src/cuda/row_filter.8uc3.cu diff --git a/modules/gpufilters/src/cuda/row_filter.8uc4.cu b/modules/cudafilters/src/cuda/row_filter.8uc4.cu similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.8uc4.cu rename to modules/cudafilters/src/cuda/row_filter.8uc4.cu diff --git a/modules/gpufilters/src/cuda/row_filter.hpp b/modules/cudafilters/src/cuda/row_filter.hpp similarity index 100% rename from modules/gpufilters/src/cuda/row_filter.hpp rename to modules/cudafilters/src/cuda/row_filter.hpp diff --git a/modules/gpufilters/src/filtering.cpp b/modules/cudafilters/src/filtering.cpp similarity index 100% rename from modules/gpufilters/src/filtering.cpp rename to modules/cudafilters/src/filtering.cpp diff --git a/modules/gpufilters/src/precomp.cpp b/modules/cudafilters/src/precomp.cpp similarity index 100% rename from modules/gpufilters/src/precomp.cpp rename to modules/cudafilters/src/precomp.cpp diff --git a/modules/gpufilters/src/precomp.hpp b/modules/cudafilters/src/precomp.hpp similarity index 98% rename from modules/gpufilters/src/precomp.hpp rename to modules/cudafilters/src/precomp.hpp index 72727e7060..f2c47073fe 100644 --- a/modules/gpufilters/src/precomp.hpp +++ b/modules/cudafilters/src/precomp.hpp @@ -45,7 +45,7 @@ #include -#include "opencv2/gpufilters.hpp" +#include "opencv2/cudafilters.hpp" #include "opencv2/cudaarithm.hpp" #include "opencv2/imgproc.hpp" diff --git a/modules/gpufilters/test/test_filters.cpp b/modules/cudafilters/test/test_filters.cpp similarity index 100% rename from modules/gpufilters/test/test_filters.cpp rename to modules/cudafilters/test/test_filters.cpp diff --git a/modules/gpufilters/test/test_main.cpp b/modules/cudafilters/test/test_main.cpp similarity index 100% rename from modules/gpufilters/test/test_main.cpp rename to modules/cudafilters/test/test_main.cpp diff --git a/modules/gpufilters/test/test_precomp.cpp b/modules/cudafilters/test/test_precomp.cpp similarity index 100% rename from modules/gpufilters/test/test_precomp.cpp rename to modules/cudafilters/test/test_precomp.cpp diff --git a/modules/gpufilters/test/test_precomp.hpp b/modules/cudafilters/test/test_precomp.hpp similarity index 98% rename from modules/gpufilters/test/test_precomp.hpp rename to modules/cudafilters/test/test_precomp.hpp index 7dfe713d3a..1cd9d1dde2 100644 --- a/modules/gpufilters/test/test_precomp.hpp +++ b/modules/cudafilters/test/test_precomp.hpp @@ -54,7 +54,7 @@ #include "opencv2/ts.hpp" #include "opencv2/ts/gpu_test.hpp" -#include "opencv2/gpufilters.hpp" +#include "opencv2/cudafilters.hpp" #include "opencv2/imgproc.hpp" #include "cvconfig.h" diff --git a/modules/gpubgsegm/CMakeLists.txt b/modules/gpubgsegm/CMakeLists.txt index 47f3fa8375..c265be9c62 100644 --- a/modules/gpubgsegm/CMakeLists.txt +++ b/modules/gpubgsegm/CMakeLists.txt @@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Background Segmentation") ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations) -ocv_define_module(gpubgsegm opencv_video OPTIONAL opencv_legacy opencv_imgproc opencv_cudaarithm opencv_gpufilters opencv_gpuimgproc) +ocv_define_module(gpubgsegm opencv_video OPTIONAL opencv_legacy opencv_imgproc opencv_cudaarithm opencv_cudafilters opencv_gpuimgproc) diff --git a/modules/gpubgsegm/src/fgd.cpp b/modules/gpubgsegm/src/fgd.cpp index 74659a10da..e46216a2ab 100644 --- a/modules/gpubgsegm/src/fgd.cpp +++ b/modules/gpubgsegm/src/fgd.cpp @@ -309,7 +309,7 @@ namespace ///////////////////////////////////////////////////////////////////////// // smoothForeground -#ifdef HAVE_OPENCV_GPUFILTERS +#ifdef HAVE_OPENCV_CUDAFILTERS namespace { @@ -610,7 +610,7 @@ namespace GpuMat buf_; GpuMat filterBrd_; -#ifdef HAVE_OPENCV_GPUFILTERS +#ifdef HAVE_OPENCV_CUDAFILTERS Ptr dilateFilter_; Ptr erodeFilter_; #endif @@ -651,7 +651,7 @@ namespace int FG_pixels_count = bgfgClassification(prevFrame_, curFrame, Ftd_, Fbd_, foreground_, countBuf_, params_, 4); -#ifdef HAVE_OPENCV_GPUFILTERS +#ifdef HAVE_OPENCV_CUDAFILTERS if (params_.perform_morphing > 0) smoothForeground(foreground_, filterBrd_, buf_, erodeFilter_, dilateFilter_, params_); #endif @@ -710,7 +710,7 @@ namespace stat_.create(firstFrame.size(), params_); fgd::setBGPixelStat(stat_); -#ifdef HAVE_OPENCV_GPUFILTERS +#ifdef HAVE_OPENCV_CUDAFILTERS if (params_.perform_morphing > 0) { Mat kernel = getStructuringElement(MORPH_RECT, Size(1 + params_.perform_morphing * 2, 1 + params_.perform_morphing * 2)); diff --git a/modules/gpubgsegm/src/gmg.cpp b/modules/gpubgsegm/src/gmg.cpp index b7eabe93a7..096c958a61 100644 --- a/modules/gpubgsegm/src/gmg.cpp +++ b/modules/gpubgsegm/src/gmg.cpp @@ -141,7 +141,7 @@ namespace GpuMat colors_; GpuMat weights_; -#if defined(HAVE_OPENCV_GPUFILTERS) && defined(HAVE_OPENCV_CUDAARITHM) +#if defined(HAVE_OPENCV_CUDAFILTERS) && defined(HAVE_OPENCV_CUDAARITHM) Ptr boxFilter_; GpuMat buf_; #endif @@ -214,7 +214,7 @@ namespace funcs[frame.depth()][frame.channels() - 1](frame, fgmask, colors_, weights_, nfeatures_, frameNum_, learningRate_, updateBackgroundModel_, StreamAccessor::getStream(stream)); -#if defined(HAVE_OPENCV_GPUFILTERS) && defined(HAVE_OPENCV_CUDAARITHM) +#if defined(HAVE_OPENCV_CUDAFILTERS) && defined(HAVE_OPENCV_CUDAARITHM) // medianBlur if (smoothingRadius_ > 0) { @@ -259,7 +259,7 @@ namespace nfeatures_.setTo(Scalar::all(0)); -#if defined(HAVE_OPENCV_GPUFILTERS) && defined(HAVE_OPENCV_CUDAARITHM) +#if defined(HAVE_OPENCV_CUDAFILTERS) && defined(HAVE_OPENCV_CUDAARITHM) if (smoothingRadius_ > 0) boxFilter_ = cuda::createBoxFilter(CV_8UC1, -1, Size(smoothingRadius_, smoothingRadius_)); #endif diff --git a/modules/gpubgsegm/src/precomp.hpp b/modules/gpubgsegm/src/precomp.hpp index 42ceddf4cb..666fa75da5 100644 --- a/modules/gpubgsegm/src/precomp.hpp +++ b/modules/gpubgsegm/src/precomp.hpp @@ -55,8 +55,8 @@ # include "opencv2/cudaarithm.hpp" #endif -#ifdef HAVE_OPENCV_GPUFILTERS -# include "opencv2/gpufilters.hpp" +#ifdef HAVE_OPENCV_CUDAFILTERS +# include "opencv2/cudafilters.hpp" #endif #ifdef HAVE_OPENCV_GPUIMGPROC diff --git a/modules/gpufeatures2d/CMakeLists.txt b/modules/gpufeatures2d/CMakeLists.txt index 678ff6a410..c4e57a4a91 100644 --- a/modules/gpufeatures2d/CMakeLists.txt +++ b/modules/gpufeatures2d/CMakeLists.txt @@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Feature Detection and Description") ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4100 /wd4324 /wd4512 /wd4515 -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter) -ocv_define_module(gpufeatures2d opencv_features2d opencv_gpufilters opencv_cudawarping) +ocv_define_module(gpufeatures2d opencv_features2d opencv_cudafilters opencv_cudawarping) diff --git a/modules/gpufeatures2d/include/opencv2/gpufeatures2d.hpp b/modules/gpufeatures2d/include/opencv2/gpufeatures2d.hpp index f8377e136e..6cd0bedce9 100644 --- a/modules/gpufeatures2d/include/opencv2/gpufeatures2d.hpp +++ b/modules/gpufeatures2d/include/opencv2/gpufeatures2d.hpp @@ -48,7 +48,7 @@ #endif #include "opencv2/core/cuda.hpp" -#include "opencv2/gpufilters.hpp" +#include "opencv2/cudafilters.hpp" namespace cv { namespace cuda { diff --git a/modules/gpufilters/CMakeLists.txt b/modules/gpufilters/CMakeLists.txt deleted file mode 100644 index eb1220d24d..0000000000 --- a/modules/gpufilters/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -if(ANDROID OR IOS) - ocv_module_disable(gpufilters) -endif() - -set(the_description "GPU-accelerated Image Filtering") - -ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations) - -ocv_define_module(gpufilters opencv_imgproc opencv_cudaarithm) diff --git a/modules/gpuimgproc/CMakeLists.txt b/modules/gpuimgproc/CMakeLists.txt index 02cdc34a57..b16345ab17 100644 --- a/modules/gpuimgproc/CMakeLists.txt +++ b/modules/gpuimgproc/CMakeLists.txt @@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Image Processing") ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4100 /wd4324 /wd4512 /wd4515 -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter) -ocv_define_module(gpuimgproc opencv_imgproc OPTIONAL opencv_cudaarithm opencv_gpufilters) +ocv_define_module(gpuimgproc opencv_imgproc OPTIONAL opencv_cudaarithm opencv_cudafilters) diff --git a/modules/gpuimgproc/src/canny.cpp b/modules/gpuimgproc/src/canny.cpp index 7d7ae80c34..1226be04b3 100644 --- a/modules/gpuimgproc/src/canny.cpp +++ b/modules/gpuimgproc/src/canny.cpp @@ -122,7 +122,7 @@ namespace GpuMat mag_; GpuMat map_; GpuMat st1_, st2_; -#ifdef HAVE_OPENCV_GPUFILTERS +#ifdef HAVE_OPENCV_CUDAFILTERS Ptr filterDX_, filterDY_; #endif int old_apperture_size_; @@ -154,7 +154,7 @@ namespace } else { -#ifndef HAVE_OPENCV_GPUFILTERS +#ifndef HAVE_OPENCV_CUDAFILTERS throw_no_cuda(); #else filterDX_->apply(image, dx_); @@ -197,7 +197,7 @@ namespace ensureSizeIsEnough(image_size, CV_32SC1, dx_); ensureSizeIsEnough(image_size, CV_32SC1, dy_); -#ifdef HAVE_OPENCV_GPUFILTERS +#ifdef HAVE_OPENCV_CUDAFILTERS if (apperture_size_ != 3 && apperture_size_ != old_apperture_size_) { filterDX_ = cuda::createDerivFilter(CV_8UC1, CV_32S, 1, 0, apperture_size_, false, 1, BORDER_REPLICATE); diff --git a/modules/gpuimgproc/src/corners.cpp b/modules/gpuimgproc/src/corners.cpp index 9e1e968517..42cfa705cf 100644 --- a/modules/gpuimgproc/src/corners.cpp +++ b/modules/gpuimgproc/src/corners.cpp @@ -45,7 +45,7 @@ using namespace cv; using namespace cv::cuda; -#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) || !defined(HAVE_OPENCV_GPUFILTERS) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) || !defined(HAVE_OPENCV_CUDAFILTERS) Ptr cv::cuda::createHarrisCorner(int, int, int, double, int) { throw_no_cuda(); return Ptr(); } Ptr cv::cuda::createMinEigenValCorner(int, int, int, int) { throw_no_cuda(); return Ptr(); } diff --git a/modules/gpuimgproc/src/cuda/corners.cu b/modules/gpuimgproc/src/cuda/corners.cu index 111a66e8af..92a37e6fde 100644 --- a/modules/gpuimgproc/src/cuda/corners.cu +++ b/modules/gpuimgproc/src/cuda/corners.cu @@ -50,7 +50,7 @@ #include "opencv2/opencv_modules.hpp" -#ifdef HAVE_OPENCV_GPUFILTERS +#ifdef HAVE_OPENCV_CUDAFILTERS namespace cv { namespace cuda { namespace device { @@ -275,6 +275,6 @@ namespace cv { namespace cuda { namespace device } }}} -#endif // HAVE_OPENCV_GPUFILTERS +#endif // HAVE_OPENCV_CUDAFILTERS #endif // CUDA_DISABLER diff --git a/modules/gpuimgproc/src/cuda/hough_circles.cu b/modules/gpuimgproc/src/cuda/hough_circles.cu index 2a505ee0a1..db1623eceb 100644 --- a/modules/gpuimgproc/src/cuda/hough_circles.cu +++ b/modules/gpuimgproc/src/cuda/hough_circles.cu @@ -48,7 +48,7 @@ #include "opencv2/opencv_modules.hpp" -#ifdef HAVE_OPENCV_GPUFILTERS +#ifdef HAVE_OPENCV_CUDAFILTERS namespace cv { namespace cuda { namespace device { @@ -255,6 +255,6 @@ namespace cv { namespace cuda { namespace device } }}} -#endif // HAVE_OPENCV_GPUFILTERS +#endif // HAVE_OPENCV_CUDAFILTERS #endif /* CUDA_DISABLER */ diff --git a/modules/gpuimgproc/src/generalized_hough.cpp b/modules/gpuimgproc/src/generalized_hough.cpp index 5f94aeeb52..f6c7d7f202 100644 --- a/modules/gpuimgproc/src/generalized_hough.cpp +++ b/modules/gpuimgproc/src/generalized_hough.cpp @@ -140,14 +140,14 @@ namespace int posCount_; private: -#ifdef HAVE_OPENCV_GPUFILTERS +#ifdef HAVE_OPENCV_CUDAFILTERS void calcEdges(InputArray src, GpuMat& edges, GpuMat& dx, GpuMat& dy); #endif void filterMinDist(); void convertTo(OutputArray positions, OutputArray votes); -#ifdef HAVE_OPENCV_GPUFILTERS +#ifdef HAVE_OPENCV_CUDAFILTERS Ptr canny_; Ptr filterDx_; Ptr filterDy_; @@ -169,14 +169,14 @@ namespace maxBufferSize_ = 10000; -#ifdef HAVE_OPENCV_GPUFILTERS +#ifdef HAVE_OPENCV_CUDAFILTERS canny_ = cuda::createCannyEdgeDetector(cannyLowThresh_, cannyHighThresh_); filterDx_ = cuda::createSobelFilter(CV_8UC1, CV_32S, 1, 0); filterDy_ = cuda::createSobelFilter(CV_8UC1, CV_32S, 0, 1); #endif } -#ifdef HAVE_OPENCV_GPUFILTERS +#ifdef HAVE_OPENCV_CUDAFILTERS void GeneralizedHoughBase::calcEdges(InputArray _src, GpuMat& edges, GpuMat& dx, GpuMat& dy) { GpuMat src = _src.getGpuMat(); @@ -200,7 +200,7 @@ namespace void GeneralizedHoughBase::setTemplateImpl(InputArray templ, Point templCenter) { -#ifndef HAVE_OPENCV_GPUFILTERS +#ifndef HAVE_OPENCV_CUDAFILTERS (void) templ; (void) templCenter; throw_no_cuda(); @@ -238,7 +238,7 @@ namespace void GeneralizedHoughBase::detectImpl(InputArray image, OutputArray positions, OutputArray votes) { -#ifndef HAVE_OPENCV_GPUFILTERS +#ifndef HAVE_OPENCV_CUDAFILTERS (void) templ; (void) templCenter; throw_no_cuda(); diff --git a/modules/gpuimgproc/src/hough_circles.cpp b/modules/gpuimgproc/src/hough_circles.cpp index 33fcf8d47f..3ea9eb1359 100644 --- a/modules/gpuimgproc/src/hough_circles.cpp +++ b/modules/gpuimgproc/src/hough_circles.cpp @@ -45,7 +45,7 @@ using namespace cv; using namespace cv::cuda; -#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) || !defined(HAVE_OPENCV_GPUFILTERS) +#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) || !defined(HAVE_OPENCV_CUDAFILTERS) Ptr cv::cuda::createHoughCirclesDetector(float, float, int, int, int, int, int) { throw_no_cuda(); return Ptr(); } diff --git a/modules/gpuimgproc/src/precomp.hpp b/modules/gpuimgproc/src/precomp.hpp index c1fea0084e..093cd24208 100644 --- a/modules/gpuimgproc/src/precomp.hpp +++ b/modules/gpuimgproc/src/precomp.hpp @@ -55,8 +55,8 @@ # include "opencv2/cudaarithm.hpp" #endif -#ifdef HAVE_OPENCV_GPUFILTERS -# include "opencv2/gpufilters.hpp" +#ifdef HAVE_OPENCV_CUDAFILTERS +# include "opencv2/cudafilters.hpp" #endif #endif /* __OPENCV_PRECOMP_H__ */ diff --git a/modules/stitching/CMakeLists.txt b/modules/stitching/CMakeLists.txt index 768abe9b1d..9e9158a99d 100644 --- a/modules/stitching/CMakeLists.txt +++ b/modules/stitching/CMakeLists.txt @@ -1,3 +1,3 @@ set(the_description "Images stitching") ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect - OPTIONAL opencv_gpu opencv_cudaarithm opencv_gpufilters opencv_gpufeatures2d opencv_nonfree) + OPTIONAL opencv_gpu opencv_cudaarithm opencv_cudafilters opencv_gpufeatures2d opencv_nonfree) diff --git a/modules/superres/CMakeLists.txt b/modules/superres/CMakeLists.txt index d4eaaf7eec..97760f8e57 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_gpufilters opencv_cudawarping opencv_gpuimgproc opencv_gpuoptflow opencv_cudacodec) + opencv_cudaarithm opencv_cudafilters opencv_cudawarping opencv_gpuimgproc opencv_gpuoptflow opencv_cudacodec) diff --git a/modules/superres/src/btv_l1_gpu.cpp b/modules/superres/src/btv_l1_gpu.cpp index e0ec64d899..2bbe5e4c80 100644 --- a/modules/superres/src/btv_l1_gpu.cpp +++ b/modules/superres/src/btv_l1_gpu.cpp @@ -50,7 +50,7 @@ using namespace cv::cuda; using namespace cv::superres; using namespace cv::superres::detail; -#if !defined(HAVE_CUDA) || !defined(HAVE_OPENCV_CUDAARITHM) || !defined(HAVE_OPENCV_CUDAWARPING) || !defined(HAVE_OPENCV_GPUFILTERS) +#if !defined(HAVE_CUDA) || !defined(HAVE_OPENCV_CUDAARITHM) || !defined(HAVE_OPENCV_CUDAWARPING) || !defined(HAVE_OPENCV_CUDAFILTERS) Ptr cv::superres::createSuperResolution_BTVL1_GPU() { diff --git a/modules/superres/src/cuda/btv_l1_gpu.cu b/modules/superres/src/cuda/btv_l1_gpu.cu index f79ee8d8c5..fffca6439a 100644 --- a/modules/superres/src/cuda/btv_l1_gpu.cu +++ b/modules/superres/src/cuda/btv_l1_gpu.cu @@ -42,7 +42,7 @@ #include "opencv2/opencv_modules.hpp" -#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAWARPING) && defined(HAVE_OPENCV_GPUFILTERS) +#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAWARPING) && defined(HAVE_OPENCV_CUDAFILTERS) #include "opencv2/core/cuda/common.hpp" #include "opencv2/core/cuda/transform.hpp" diff --git a/modules/superres/src/precomp.hpp b/modules/superres/src/precomp.hpp index 7b045ff1a1..7d14d855d6 100644 --- a/modules/superres/src/precomp.hpp +++ b/modules/superres/src/precomp.hpp @@ -65,8 +65,8 @@ # include "opencv2/cudawarping.hpp" #endif -#ifdef HAVE_OPENCV_GPUFILTERS -# include "opencv2/gpufilters.hpp" +#ifdef HAVE_OPENCV_CUDAFILTERS +# include "opencv2/cudafilters.hpp" #endif #ifdef HAVE_OPENCV_GPUIMGPROC diff --git a/modules/superres/test/test_superres.cpp b/modules/superres/test/test_superres.cpp index 2a2774feb6..5e55e073f7 100644 --- a/modules/superres/test/test_superres.cpp +++ b/modules/superres/test/test_superres.cpp @@ -268,7 +268,7 @@ TEST_F(SuperResolution, BTVL1) RunTest(cv::superres::createSuperResolution_BTVL1()); } -#if defined(HAVE_CUDA) && defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAWARPING) && defined(HAVE_OPENCV_GPUFILTERS) +#if defined(HAVE_CUDA) && defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAWARPING) && defined(HAVE_OPENCV_CUDAFILTERS) TEST_F(SuperResolution, BTVL1_GPU) { diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt index 20f30e0d72..279eafe238 100644 --- a/samples/cpp/CMakeLists.txt +++ b/samples/cpp/CMakeLists.txt @@ -25,8 +25,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) if(HAVE_opencv_cudaarithm) ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/cudaarithm/include") endif() - if(HAVE_opencv_gpufilters) - ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpufilters/include") + if(HAVE_opencv_cudafilters) + ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/cudafilters/include") endif() if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS) @@ -53,7 +53,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_CPP_SAMPLES_REQUIRED_DEPS}) if("${srcs}" MATCHES "gpu/") - target_link_libraries(${the_target} opencv_cudaarithm opencv_gpufilters) + target_link_libraries(${the_target} opencv_cudaarithm opencv_cudafilters) endif() set_target_properties(${the_target} PROPERTIES @@ -79,7 +79,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) ocv_list_filterout(cpp_samples Qt_sample) endif() - if(NOT HAVE_opencv_cudaarithm OR NOT HAVE_opencv_gpufilters) + if(NOT HAVE_opencv_cudaarithm OR NOT HAVE_opencv_cudafilters) ocv_list_filterout(cpp_samples "/gpu/") endif() diff --git a/samples/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp b/samples/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp index 29f5a7e7ca..b17e9f169f 100644 --- a/samples/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp +++ b/samples/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp @@ -8,7 +8,7 @@ // GPU structures and methods #include -#include +#include using namespace std; using namespace cv; diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt index 66aa9d7758..ece15d50b0 100644 --- a/samples/gpu/CMakeLists.txt +++ b/samples/gpu/CMakeLists.txt @@ -2,7 +2,7 @@ SET(OPENCV_GPU_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc ope opencv_ml opencv_video opencv_objdetect opencv_features2d opencv_calib3d opencv_legacy opencv_contrib opencv_gpu opencv_nonfree opencv_softcascade opencv_superres - opencv_cudaarithm opencv_gpufilters opencv_cudawarping opencv_gpuimgproc + opencv_cudaarithm opencv_cudafilters opencv_cudawarping opencv_gpuimgproc opencv_gpufeatures2d opencv_gpuoptflow opencv_gpubgsegm opencv_cudastereo opencv_cudalegacy) diff --git a/samples/gpu/morphology.cpp b/samples/gpu/morphology.cpp index 6cae765ae5..5261e066d2 100644 --- a/samples/gpu/morphology.cpp +++ b/samples/gpu/morphology.cpp @@ -2,7 +2,7 @@ #include "opencv2/imgproc.hpp" #include "opencv2/highgui.hpp" -#include "opencv2/gpufilters.hpp" +#include "opencv2/cudafilters.hpp" #include "opencv2/gpuimgproc.hpp" using namespace std; diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp index 043a137089..42c91f1008 100644 --- a/samples/gpu/performance/tests.cpp +++ b/samples/gpu/performance/tests.cpp @@ -8,7 +8,7 @@ #include "opencv2/cudaarithm.hpp" #include "opencv2/cudawarping.hpp" #include "opencv2/gpufeatures2d.hpp" -#include "opencv2/gpufilters.hpp" +#include "opencv2/cudafilters.hpp" #include "opencv2/gpuoptflow.hpp" #include "opencv2/gpubgsegm.hpp"