renamed gpuimgproc -> cudaimgproc

11 years ago · a0ae602bb7
parent 219b662127
commit a0ae602bb7
93 changed files with 54 additions and 54 deletions
--- a/modules/cudaimgproc/CMakeLists.txt
+++ b/modules/cudaimgproc/CMakeLists.txt
@ -0,0 +1,9 @@
 if(ANDROID OR IOS)
  ocv_module_disable(cudaimgproc)
 endif()
 set(the_description "CUDA-accelerated Image Processing")
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4100 /wd4324 /wd4512 /wd4515 -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter)
 ocv_define_module(cudaimgproc opencv_imgproc OPTIONAL opencv_cudaarithm opencv_cudafilters)
--- a/modules/cudaimgproc/doc/color.rst
+++ b/modules/cudaimgproc/doc/color.rst
--- a/modules/cudaimgproc/doc/cudaimgproc.rst
+++ b/modules/cudaimgproc/doc/cudaimgproc.rst
--- a/modules/cudaimgproc/doc/feature_detection.rst
+++ b/modules/cudaimgproc/doc/feature_detection.rst
--- a/modules/cudaimgproc/doc/histogram.rst
+++ b/modules/cudaimgproc/doc/histogram.rst
--- a/modules/cudaimgproc/doc/hough.rst
+++ b/modules/cudaimgproc/doc/hough.rst
--- a/modules/cudaimgproc/doc/imgproc.rst
+++ b/modules/cudaimgproc/doc/imgproc.rst
--- a/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp
+++ b/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp
@ -40,11 +40,11 @@
 //
 //M*/
-#ifndef __OPENCV_GPUIMGPROC_HPP__
+#ifndef __OPENCV_CUDAIMGPROC_HPP__
-#define __OPENCV_GPUIMGPROC_HPP__
+#define __OPENCV_CUDAIMGPROC_HPP__
 #ifndef __cplusplus
-#  error gpuimgproc.hpp header must be compiled as C++
+#  error cudaimgproc.hpp header must be compiled as C++
 #endif
 #include "opencv2/core/cuda.hpp"
@ -359,4 +359,4 @@ CV_EXPORTS void blendLinear(InputArray img1, InputArray img2, InputArray weights
 }} // namespace cv { namespace cuda {
-#endif /* __OPENCV_GPUIMGPROC_HPP__ */
+#endif /* __OPENCV_CUDAIMGPROC_HPP__ */
--- a/modules/cudaimgproc/perf/perf_bilateral_filter.cpp
+++ b/modules/cudaimgproc/perf/perf_bilateral_filter.cpp
--- a/modules/cudaimgproc/perf/perf_blend.cpp
+++ b/modules/cudaimgproc/perf/perf_blend.cpp
--- a/modules/cudaimgproc/perf/perf_canny.cpp
+++ b/modules/cudaimgproc/perf/perf_canny.cpp
--- a/modules/cudaimgproc/perf/perf_color.cpp
+++ b/modules/cudaimgproc/perf/perf_color.cpp
--- a/modules/cudaimgproc/perf/perf_corners.cpp
+++ b/modules/cudaimgproc/perf/perf_corners.cpp
--- a/modules/cudaimgproc/perf/perf_gftt.cpp
+++ b/modules/cudaimgproc/perf/perf_gftt.cpp
--- a/modules/cudaimgproc/perf/perf_histogram.cpp
+++ b/modules/cudaimgproc/perf/perf_histogram.cpp
--- a/modules/cudaimgproc/perf/perf_hough.cpp
+++ b/modules/cudaimgproc/perf/perf_hough.cpp
--- a/modules/cudaimgproc/perf/perf_main.cpp
+++ b/modules/cudaimgproc/perf/perf_main.cpp
@ -44,4 +44,4 @@
 using namespace perf;
-CV_PERF_TEST_CUDA_MAIN(gpuimgproc)
+CV_PERF_TEST_CUDA_MAIN(cudaimgproc)
--- a/modules/cudaimgproc/perf/perf_match_template.cpp
+++ b/modules/cudaimgproc/perf/perf_match_template.cpp
--- a/modules/cudaimgproc/perf/perf_mean_shift.cpp
+++ b/modules/cudaimgproc/perf/perf_mean_shift.cpp
--- a/modules/cudaimgproc/perf/perf_precomp.cpp
+++ b/modules/cudaimgproc/perf/perf_precomp.cpp
--- a/modules/cudaimgproc/perf/perf_precomp.hpp
+++ b/modules/cudaimgproc/perf/perf_precomp.hpp
@ -54,7 +54,7 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_perf.hpp"
-#include "opencv2/gpuimgproc.hpp"
+#include "opencv2/cudaimgproc.hpp"
 #include "opencv2/imgproc.hpp"
 #ifdef GTEST_CREATE_SHARED_LIBRARY
--- a/modules/cudaimgproc/src/bilateral_filter.cpp
+++ b/modules/cudaimgproc/src/bilateral_filter.cpp
--- a/modules/cudaimgproc/src/blend.cpp
+++ b/modules/cudaimgproc/src/blend.cpp
--- a/modules/cudaimgproc/src/canny.cpp
+++ b/modules/cudaimgproc/src/canny.cpp
--- a/modules/cudaimgproc/src/color.cpp
+++ b/modules/cudaimgproc/src/color.cpp
--- a/modules/cudaimgproc/src/corners.cpp
+++ b/modules/cudaimgproc/src/corners.cpp
--- a/modules/cudaimgproc/src/cuda/bilateral_filter.cu
+++ b/modules/cudaimgproc/src/cuda/bilateral_filter.cu
--- a/modules/cudaimgproc/src/cuda/blend.cu
+++ b/modules/cudaimgproc/src/cuda/blend.cu
--- a/modules/cudaimgproc/src/cuda/build_point_list.cu
+++ b/modules/cudaimgproc/src/cuda/build_point_list.cu
--- a/modules/cudaimgproc/src/cuda/canny.cu
+++ b/modules/cudaimgproc/src/cuda/canny.cu
--- a/modules/cudaimgproc/src/cuda/clahe.cu
+++ b/modules/cudaimgproc/src/cuda/clahe.cu
--- a/modules/cudaimgproc/src/cuda/color.cu
+++ b/modules/cudaimgproc/src/cuda/color.cu
--- a/modules/cudaimgproc/src/cuda/corners.cu
+++ b/modules/cudaimgproc/src/cuda/corners.cu
--- a/modules/cudaimgproc/src/cuda/debayer.cu
+++ b/modules/cudaimgproc/src/cuda/debayer.cu
--- a/modules/cudaimgproc/src/cuda/generalized_hough.cu
+++ b/modules/cudaimgproc/src/cuda/generalized_hough.cu
--- a/modules/cudaimgproc/src/cuda/gftt.cu
+++ b/modules/cudaimgproc/src/cuda/gftt.cu
--- a/modules/cudaimgproc/src/cuda/hist.cu
+++ b/modules/cudaimgproc/src/cuda/hist.cu
--- a/modules/cudaimgproc/src/cuda/hough_circles.cu
+++ b/modules/cudaimgproc/src/cuda/hough_circles.cu
--- a/modules/cudaimgproc/src/cuda/hough_lines.cu
+++ b/modules/cudaimgproc/src/cuda/hough_lines.cu
--- a/modules/cudaimgproc/src/cuda/hough_segments.cu
+++ b/modules/cudaimgproc/src/cuda/hough_segments.cu
--- a/modules/cudaimgproc/src/cuda/match_template.cu
+++ b/modules/cudaimgproc/src/cuda/match_template.cu
--- a/modules/cudaimgproc/src/cuda/mean_shift.cu
+++ b/modules/cudaimgproc/src/cuda/mean_shift.cu
--- a/modules/cudaimgproc/src/cvt_color_internal.h
+++ b/modules/cudaimgproc/src/cvt_color_internal.h
--- a/modules/cudaimgproc/src/generalized_hough.cpp
+++ b/modules/cudaimgproc/src/generalized_hough.cpp
--- a/modules/cudaimgproc/src/gftt.cpp
+++ b/modules/cudaimgproc/src/gftt.cpp
--- a/modules/cudaimgproc/src/histogram.cpp
+++ b/modules/cudaimgproc/src/histogram.cpp
--- a/modules/cudaimgproc/src/hough_circles.cpp
+++ b/modules/cudaimgproc/src/hough_circles.cpp
--- a/modules/cudaimgproc/src/hough_lines.cpp
+++ b/modules/cudaimgproc/src/hough_lines.cpp
--- a/modules/cudaimgproc/src/hough_segments.cpp
+++ b/modules/cudaimgproc/src/hough_segments.cpp
--- a/modules/cudaimgproc/src/match_template.cpp
+++ b/modules/cudaimgproc/src/match_template.cpp
--- a/modules/cudaimgproc/src/mean_shift.cpp
+++ b/modules/cudaimgproc/src/mean_shift.cpp
--- a/modules/cudaimgproc/src/mssegmentation.cpp
+++ b/modules/cudaimgproc/src/mssegmentation.cpp
--- a/modules/cudaimgproc/src/precomp.cpp
+++ b/modules/cudaimgproc/src/precomp.cpp
--- a/modules/cudaimgproc/src/precomp.hpp
+++ b/modules/cudaimgproc/src/precomp.hpp
@ -43,7 +43,7 @@
 #ifndef __OPENCV_PRECOMP_H__
 #define __OPENCV_PRECOMP_H__
-#include "opencv2/gpuimgproc.hpp"
+#include "opencv2/cudaimgproc.hpp"
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/private.hpp"
--- a/modules/cudaimgproc/test/test_bilateral_filter.cpp
+++ b/modules/cudaimgproc/test/test_bilateral_filter.cpp
--- a/modules/cudaimgproc/test/test_blend.cpp
+++ b/modules/cudaimgproc/test/test_blend.cpp
--- a/modules/cudaimgproc/test/test_canny.cpp
+++ b/modules/cudaimgproc/test/test_canny.cpp
--- a/modules/cudaimgproc/test/test_color.cpp
+++ b/modules/cudaimgproc/test/test_color.cpp
--- a/modules/cudaimgproc/test/test_corners.cpp
+++ b/modules/cudaimgproc/test/test_corners.cpp
--- a/modules/cudaimgproc/test/test_gftt.cpp
+++ b/modules/cudaimgproc/test/test_gftt.cpp
--- a/modules/cudaimgproc/test/test_histogram.cpp
+++ b/modules/cudaimgproc/test/test_histogram.cpp
--- a/modules/cudaimgproc/test/test_hough.cpp
+++ b/modules/cudaimgproc/test/test_hough.cpp
--- a/modules/cudaimgproc/test/test_main.cpp
+++ b/modules/cudaimgproc/test/test_main.cpp
--- a/modules/cudaimgproc/test/test_match_template.cpp
+++ b/modules/cudaimgproc/test/test_match_template.cpp
--- a/modules/cudaimgproc/test/test_mean_shift.cpp
+++ b/modules/cudaimgproc/test/test_mean_shift.cpp
--- a/modules/cudaimgproc/test/test_precomp.cpp
+++ b/modules/cudaimgproc/test/test_precomp.cpp
--- a/modules/cudaimgproc/test/test_precomp.hpp
+++ b/modules/cudaimgproc/test/test_precomp.hpp
@ -54,7 +54,7 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_test.hpp"
-#include "opencv2/gpuimgproc.hpp"
+#include "opencv2/cudaimgproc.hpp"
 #include "opencv2/imgproc.hpp"
 #include "cvconfig.h"
--- 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_cudafilters opencv_gpuimgproc)
+ocv_define_module(gpubgsegm opencv_video OPTIONAL opencv_legacy opencv_imgproc opencv_cudaarithm opencv_cudafilters opencv_cudaimgproc)
--- a/modules/gpubgsegm/perf/perf_bgsegm.cpp
+++ b/modules/gpubgsegm/perf/perf_bgsegm.cpp
@ -46,8 +46,8 @@
 #  include "opencv2/legacy.hpp"
 #endif
-#ifdef HAVE_OPENCV_GPUIMGPROC
+#ifdef HAVE_OPENCV_CUDAIMGPROC
-#  include "opencv2/gpuimgproc.hpp"
+#  include "opencv2/cudaimgproc.hpp"
 #endif
 using namespace std;
@ -121,7 +121,7 @@ PERF_TEST_P(Video, FGDStatModel,
        GPU_SANITY_CHECK(foreground, 1e-2, ERROR_RELATIVE);
-#ifdef HAVE_OPENCV_GPUIMGPROC
+#ifdef HAVE_OPENCV_CUDAIMGPROC
        cv::cuda::GpuMat background3, background;
        d_fgd->getBackgroundImage(background3);
        cv::cuda::cvtColor(background3, background, cv::COLOR_BGR2BGRA);
--- a/modules/gpubgsegm/src/fgd.cpp
+++ b/modules/gpubgsegm/src/fgd.cpp
@ -45,7 +45,7 @@
 using namespace cv;
 using namespace cv::cuda;
-#if !defined(HAVE_CUDA) || defined(CUDA_DISABLER) || !defined(HAVE_OPENCV_IMGPROC) || !defined(HAVE_OPENCV_CUDAARITHM) || !defined(HAVE_OPENCV_GPUIMGPROC)
+#if !defined(HAVE_CUDA) || defined(CUDA_DISABLER) || !defined(HAVE_OPENCV_IMGPROC) || !defined(HAVE_OPENCV_CUDAARITHM) || !defined(HAVE_OPENCV_CUDAIMGPROC)
 cv::cuda::FGDParams::FGDParams() { throw_no_cuda(); }
--- a/modules/gpubgsegm/src/precomp.hpp
+++ b/modules/gpubgsegm/src/precomp.hpp
@ -59,8 +59,8 @@
 #  include "opencv2/cudafilters.hpp"
 #endif
-#ifdef HAVE_OPENCV_GPUIMGPROC
+#ifdef HAVE_OPENCV_CUDAIMGPROC
-#  include "opencv2/gpuimgproc.hpp"
+#  include "opencv2/cudaimgproc.hpp"
 #endif
 #endif /* __OPENCV_PRECOMP_H__ */
--- a/modules/gpuimgproc/CMakeLists.txt
+++ b/modules/gpuimgproc/CMakeLists.txt
@ -1,9 +0,0 @@
 if(ANDROID OR IOS)
  ocv_module_disable(gpuimgproc)
 endif()
 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_cudafilters)
--- a/modules/gpuoptflow/CMakeLists.txt
+++ b/modules/gpuoptflow/CMakeLists.txt
@ -6,4 +6,4 @@ 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_gpuimgproc OPTIONAL opencv_cudalegacy)
+ocv_define_module(gpuoptflow opencv_video opencv_legacy opencv_cudaarithm opencv_cudawarping opencv_cudaimgproc OPTIONAL opencv_cudalegacy)
--- a/modules/gpuoptflow/src/precomp.hpp
+++ b/modules/gpuoptflow/src/precomp.hpp
@ -48,7 +48,7 @@
 #include "opencv2/gpuoptflow.hpp"
 #include "opencv2/cudaarithm.hpp"
 #include "opencv2/cudawarping.hpp"
-#include "opencv2/gpuimgproc.hpp"
+#include "opencv2/cudaimgproc.hpp"
 #include "opencv2/video.hpp"
 #include "opencv2/core/private.cuda.hpp"
--- a/modules/photo/CMakeLists.txt
+++ b/modules/photo/CMakeLists.txt
@ -4,4 +4,4 @@ if(HAVE_CUDA)
  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations)
 endif()
-ocv_define_module(photo opencv_imgproc OPTIONAL opencv_cudaarithm opencv_gpuimgproc)
+ocv_define_module(photo opencv_imgproc OPTIONAL opencv_cudaarithm opencv_cudaimgproc)
--- a/modules/photo/perf/perf_gpu.cpp
+++ b/modules/photo/perf/perf_gpu.cpp
@ -47,7 +47,7 @@
 #include "opencv2/opencv_modules.hpp"
-#if defined (HAVE_CUDA) && defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUIMGPROC)
+#if defined (HAVE_CUDA) && defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAIMGPROC)
 using namespace std;
 using namespace testing;
--- a/modules/photo/src/denoising_gpu.cpp
+++ b/modules/photo/src/denoising_gpu.cpp
@ -51,14 +51,14 @@
 #  include "opencv2/cudaarithm.hpp"
 #endif
-#ifdef HAVE_OPENCV_GPUIMGPROC
+#ifdef HAVE_OPENCV_CUDAIMGPROC
-#  include "opencv2/gpuimgproc.hpp"
+#  include "opencv2/cudaimgproc.hpp"
 #endif
 using namespace cv;
 using namespace cv::cuda;
-#if !defined (HAVE_CUDA) || !defined(HAVE_OPENCV_CUDAARITHM) || !defined(HAVE_OPENCV_GPUIMGPROC)
+#if !defined (HAVE_CUDA) || !defined(HAVE_OPENCV_CUDAARITHM) || !defined(HAVE_OPENCV_CUDAIMGPROC)
 void cv::cuda::nonLocalMeans(const GpuMat&, GpuMat&, float, int, int, int, Stream&) { throw_no_cuda(); }
 void cv::cuda::FastNonLocalMeansDenoising::simpleMethod(const GpuMat&, GpuMat&, float, int, int, Stream&) { throw_no_cuda(); }
--- a/modules/photo/test/test_denoising_gpu.cpp
+++ b/modules/photo/test/test_denoising_gpu.cpp
@ -48,7 +48,7 @@
 #include "opencv2/opencv_modules.hpp"
 #include "cvconfig.h"
-#if defined (HAVE_CUDA) && defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUIMGPROC)
+#if defined (HAVE_CUDA) && defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAIMGPROC)
 using namespace cvtest;
--- 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_gpuimgproc opencv_gpuoptflow opencv_cudacodec)
+                  opencv_cudaarithm opencv_cudafilters opencv_cudawarping opencv_cudaimgproc opencv_gpuoptflow opencv_cudacodec)
--- a/modules/superres/src/input_array_utility.cpp
+++ b/modules/superres/src/input_array_utility.cpp
@ -190,7 +190,7 @@ namespace
        switch (src.kind())
        {
        case _InputArray::GPU_MAT:
-            #ifdef HAVE_OPENCV_GPUIMGPROC
+            #ifdef HAVE_OPENCV_CUDAIMGPROC
                cuda::cvtColor(src.getGpuMat(), dst.getGpuMatRef(), code, cn);
            #else
                CV_Error(cv::Error::StsNotImplemented, "The called functionality is disabled for current build or platform");
--- a/modules/superres/src/precomp.hpp
+++ b/modules/superres/src/precomp.hpp
@ -69,8 +69,8 @@
 #  include "opencv2/cudafilters.hpp"
 #endif
-#ifdef HAVE_OPENCV_GPUIMGPROC
+#ifdef HAVE_OPENCV_CUDAIMGPROC
-#  include "opencv2/gpuimgproc.hpp"
+#  include "opencv2/cudaimgproc.hpp"
 #endif
 #ifdef HAVE_OPENCV_GPUOPTFLOW
--- a/modules/videostab/include/opencv2/videostab/global_motion.hpp
+++ b/modules/videostab/include/opencv2/videostab/global_motion.hpp
@ -52,8 +52,8 @@
 #include "opencv2/videostab/motion_core.hpp"
 #include "opencv2/videostab/outlier_rejection.hpp"
-#ifdef HAVE_OPENCV_GPUIMGPROC
+#ifdef HAVE_OPENCV_CUDAIMGPROC
-#  include "opencv2/gpuimgproc.hpp"
+#  include "opencv2/cudaimgproc.hpp"
 #endif
 namespace cv
@ -199,7 +199,7 @@ private:
    std::vector<Point2f> pointsPrevGood_, pointsGood_;
 };
-#if defined(HAVE_OPENCV_GPUIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
+#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
 class CV_EXPORTS KeypointBasedMotionEstimatorGpu : public ImageMotionEstimatorBase
 {
@ -230,7 +230,7 @@ private:
    std::vector<uchar> rejectionStatus_;
 };
-#endif // defined(HAVE_OPENCV_GPUIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
+#endif // defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
 CV_EXPORTS Mat getMotion(int from, int to, const std::vector<Mat> &motions);
--- 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_GPUIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
+#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
 KeypointBasedMotionEstimatorGpu::KeypointBasedMotionEstimatorGpu(Ptr<MotionEstimatorBase> 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_GPUIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
+#endif // defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
 Mat getMotion(int from, int to, const std::vector<Mat> &motions)
--- a/samples/cpp/CMakeLists.txt
+++ b/samples/cpp/CMakeLists.txt
@ -19,8 +19,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
  if(HAVE_opencv_gpuoptflow)
    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpuoptflow/include")
  endif()
-  if(HAVE_opencv_gpuimgproc)
+  if(HAVE_opencv_cudaimgproc)
-    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpuimgproc/include")
+    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/cudaimgproc/include")
  endif()
  if(HAVE_opencv_cudaarithm)
    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/cudaarithm/include")
--- a/samples/cpp/videostab.cpp
+++ b/samples/cpp/videostab.cpp
@ -216,7 +216,7 @@ public:
            outlierRejector = tblor;
        }
-#if defined(HAVE_OPENCV_GPUIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
+#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
        if (gpu)
        {
            KeypointBasedMotionEstimatorGpu *kbest = new KeypointBasedMotionEstimatorGpu(est);
@ -257,7 +257,7 @@ public:
            outlierRejector = tblor;
        }
-#if defined(HAVE_OPENCV_GPUIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
+#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
        if (gpu)
        {
            KeypointBasedMotionEstimatorGpu *kbest = new KeypointBasedMotionEstimatorGpu(est);
--- 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_cudafilters opencv_cudawarping opencv_gpuimgproc
+                                     opencv_cudaarithm opencv_cudafilters opencv_cudawarping opencv_cudaimgproc
                                     opencv_gpufeatures2d opencv_gpuoptflow opencv_gpubgsegm
                                     opencv_cudastereo opencv_cudalegacy)
--- a/samples/gpu/alpha_comp.cpp
+++ b/samples/gpu/alpha_comp.cpp
@ -2,7 +2,7 @@
 #include "opencv2/core/opengl.hpp"
 #include "opencv2/highgui/highgui.hpp"
-#include "opencv2/gpuimgproc.hpp"
+#include "opencv2/cudaimgproc.hpp"
 using namespace std;
 using namespace cv;
--- a/samples/gpu/cascadeclassifier.cpp
+++ b/samples/gpu/cascadeclassifier.cpp
@ -11,7 +11,7 @@
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/gpu.hpp"
-#include "opencv2/gpuimgproc.hpp"
+#include "opencv2/cudaimgproc.hpp"
 #include "opencv2/cudawarping.hpp"
 using namespace std;
--- a/samples/gpu/generalized_hough.cpp
+++ b/samples/gpu/generalized_hough.cpp
@ -5,7 +5,7 @@
 #include "opencv2/core.hpp"
 #include "opencv2/core/utility.hpp"
 #include "opencv2/imgproc.hpp"
-#include "opencv2/gpuimgproc.hpp"
+#include "opencv2/cudaimgproc.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/contrib.hpp"
--- a/samples/gpu/houghlines.cpp
+++ b/samples/gpu/houghlines.cpp
@ -5,7 +5,7 @@
 #include <opencv2/core/utility.hpp>
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
-#include "opencv2/gpuimgproc.hpp"
+#include "opencv2/cudaimgproc.hpp"
 using namespace std;
 using namespace cv;
--- a/samples/gpu/morphology.cpp
+++ b/samples/gpu/morphology.cpp
@ -3,7 +3,7 @@
 #include "opencv2/imgproc.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/cudafilters.hpp"
-#include "opencv2/gpuimgproc.hpp"
+#include "opencv2/cudaimgproc.hpp"
 using namespace std;
 using namespace cv;
--- a/samples/gpu/performance/tests.cpp
+++ b/samples/gpu/performance/tests.cpp
@ -4,7 +4,7 @@
 #include "opencv2/calib3d.hpp"
 #include "opencv2/video.hpp"
 #include "opencv2/gpu.hpp"
-#include "opencv2/gpuimgproc.hpp"
+#include "opencv2/cudaimgproc.hpp"
 #include "opencv2/cudaarithm.hpp"
 #include "opencv2/cudawarping.hpp"
 #include "opencv2/gpufeatures2d.hpp"
--- a/samples/gpu/pyrlk_optical_flow.cpp
+++ b/samples/gpu/pyrlk_optical_flow.cpp
@ -7,7 +7,7 @@
 #include "opencv2/highgui.hpp"
 #include "opencv2/video.hpp"
 #include "opencv2/gpuoptflow.hpp"
-#include "opencv2/gpuimgproc.hpp"
+#include "opencv2/cudaimgproc.hpp"
 using namespace std;
 using namespace cv;
`@ -44,4 +44,4 @@`

	`using namespace perf;`	`using namespace perf;`

	`CV_PERF_TEST_CUDA_MAIN(gpuimgproc)`	`CV_PERF_TEST_CUDA_MAIN(cudaimgproc)`
`@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Background Segmentation")`

	`ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations)`	`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_cudafilters opencv_gpuimgproc)`	`ocv_define_module(gpubgsegm opencv_video OPTIONAL opencv_legacy opencv_imgproc opencv_cudaarithm opencv_cudafilters opencv_cudaimgproc)`