renamed gpuimgproc -> cudaimgproc

diff --git a/modules/cudaimgproc/CMakeLists.txt b/modules/cudaimgproc/CMakeLists.txt
new file mode 100644 (file)
index 0000000..bfb8f35
--- /dev/null
+++ 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)

diff --git a/modules/gpuimgproc/doc/color.rst b/modules/cudaimgproc/doc/color.rst
similarity index 100%
rename from modules/gpuimgproc/doc/color.rst
rename to modules/cudaimgproc/doc/color.rst

diff --git a/modules/gpuimgproc/doc/gpuimgproc.rst b/modules/cudaimgproc/doc/cudaimgproc.rst
similarity index 100%
rename from modules/gpuimgproc/doc/gpuimgproc.rst
rename to modules/cudaimgproc/doc/cudaimgproc.rst

diff --git a/modules/gpuimgproc/doc/feature_detection.rst b/modules/cudaimgproc/doc/feature_detection.rst
similarity index 100%
rename from modules/gpuimgproc/doc/feature_detection.rst
rename to modules/cudaimgproc/doc/feature_detection.rst

diff --git a/modules/gpuimgproc/doc/histogram.rst b/modules/cudaimgproc/doc/histogram.rst
similarity index 100%
rename from modules/gpuimgproc/doc/histogram.rst
rename to modules/cudaimgproc/doc/histogram.rst

diff --git a/modules/gpuimgproc/doc/hough.rst b/modules/cudaimgproc/doc/hough.rst
similarity index 100%
rename from modules/gpuimgproc/doc/hough.rst
rename to modules/cudaimgproc/doc/hough.rst

diff --git a/modules/gpuimgproc/doc/imgproc.rst b/modules/cudaimgproc/doc/imgproc.rst
similarity index 100%
rename from modules/gpuimgproc/doc/imgproc.rst
rename to modules/cudaimgproc/doc/imgproc.rst

diff --git a/modules/gpuimgproc/include/opencv2/gpuimgproc.hpp b/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp
similarity index 98%
rename from modules/gpuimgproc/include/opencv2/gpuimgproc.hpp
rename to modules/cudaimgproc/include/opencv2/cudaimgproc.hpp
index b5bb2b1..be141b1 100644 (file)
--- a/modules/gpuimgproc/include/opencv2/gpuimgproc.hpp
+++ b/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp
@@ -40,11 +40,11 @@
 //
 //M*/
 
-#ifndef __OPENCV_GPUIMGPROC_HPP__
-#define __OPENCV_GPUIMGPROC_HPP__
+#ifndef __OPENCV_CUDAIMGPROC_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__ */

diff --git a/modules/gpuimgproc/perf/perf_bilateral_filter.cpp b/modules/cudaimgproc/perf/perf_bilateral_filter.cpp
similarity index 100%
rename from modules/gpuimgproc/perf/perf_bilateral_filter.cpp
rename to modules/cudaimgproc/perf/perf_bilateral_filter.cpp

diff --git a/modules/gpuimgproc/perf/perf_blend.cpp b/modules/cudaimgproc/perf/perf_blend.cpp
similarity index 100%
rename from modules/gpuimgproc/perf/perf_blend.cpp
rename to modules/cudaimgproc/perf/perf_blend.cpp

diff --git a/modules/gpuimgproc/perf/perf_canny.cpp b/modules/cudaimgproc/perf/perf_canny.cpp
similarity index 100%
rename from modules/gpuimgproc/perf/perf_canny.cpp
rename to modules/cudaimgproc/perf/perf_canny.cpp

diff --git a/modules/gpuimgproc/perf/perf_color.cpp b/modules/cudaimgproc/perf/perf_color.cpp
similarity index 100%
rename from modules/gpuimgproc/perf/perf_color.cpp
rename to modules/cudaimgproc/perf/perf_color.cpp

diff --git a/modules/gpuimgproc/perf/perf_corners.cpp b/modules/cudaimgproc/perf/perf_corners.cpp
similarity index 100%
rename from modules/gpuimgproc/perf/perf_corners.cpp
rename to modules/cudaimgproc/perf/perf_corners.cpp

diff --git a/modules/gpuimgproc/perf/perf_gftt.cpp b/modules/cudaimgproc/perf/perf_gftt.cpp
similarity index 100%
rename from modules/gpuimgproc/perf/perf_gftt.cpp
rename to modules/cudaimgproc/perf/perf_gftt.cpp

diff --git a/modules/gpuimgproc/perf/perf_histogram.cpp b/modules/cudaimgproc/perf/perf_histogram.cpp
similarity index 100%
rename from modules/gpuimgproc/perf/perf_histogram.cpp
rename to modules/cudaimgproc/perf/perf_histogram.cpp

diff --git a/modules/gpuimgproc/perf/perf_hough.cpp b/modules/cudaimgproc/perf/perf_hough.cpp
similarity index 100%
rename from modules/gpuimgproc/perf/perf_hough.cpp
rename to modules/cudaimgproc/perf/perf_hough.cpp

diff --git a/modules/gpuimgproc/perf/perf_main.cpp b/modules/cudaimgproc/perf/perf_main.cpp
similarity index 98%
rename from modules/gpuimgproc/perf/perf_main.cpp
rename to modules/cudaimgproc/perf/perf_main.cpp
index 8eb27a2..11a1651 100644 (file)
--- a/modules/gpuimgproc/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)

diff --git a/modules/gpuimgproc/perf/perf_match_template.cpp b/modules/cudaimgproc/perf/perf_match_template.cpp
similarity index 100%
rename from modules/gpuimgproc/perf/perf_match_template.cpp
rename to modules/cudaimgproc/perf/perf_match_template.cpp

diff --git a/modules/gpuimgproc/perf/perf_mean_shift.cpp b/modules/cudaimgproc/perf/perf_mean_shift.cpp
similarity index 100%
rename from modules/gpuimgproc/perf/perf_mean_shift.cpp
rename to modules/cudaimgproc/perf/perf_mean_shift.cpp

diff --git a/modules/gpuimgproc/perf/perf_precomp.cpp b/modules/cudaimgproc/perf/perf_precomp.cpp
similarity index 100%
rename from modules/gpuimgproc/perf/perf_precomp.cpp
rename to modules/cudaimgproc/perf/perf_precomp.cpp

diff --git a/modules/gpuimgproc/perf/perf_precomp.hpp b/modules/cudaimgproc/perf/perf_precomp.hpp
similarity index 98%
rename from modules/gpuimgproc/perf/perf_precomp.hpp
rename to modules/cudaimgproc/perf/perf_precomp.hpp
index adaa4eb..1aa6f8f 100644 (file)
--- a/modules/gpuimgproc/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

diff --git a/modules/gpuimgproc/src/bilateral_filter.cpp b/modules/cudaimgproc/src/bilateral_filter.cpp
similarity index 100%
rename from modules/gpuimgproc/src/bilateral_filter.cpp
rename to modules/cudaimgproc/src/bilateral_filter.cpp

diff --git a/modules/gpuimgproc/src/blend.cpp b/modules/cudaimgproc/src/blend.cpp
similarity index 100%
rename from modules/gpuimgproc/src/blend.cpp
rename to modules/cudaimgproc/src/blend.cpp

diff --git a/modules/gpuimgproc/src/canny.cpp b/modules/cudaimgproc/src/canny.cpp
similarity index 100%
rename from modules/gpuimgproc/src/canny.cpp
rename to modules/cudaimgproc/src/canny.cpp

diff --git a/modules/gpuimgproc/src/color.cpp b/modules/cudaimgproc/src/color.cpp
similarity index 100%
rename from modules/gpuimgproc/src/color.cpp
rename to modules/cudaimgproc/src/color.cpp

diff --git a/modules/gpuimgproc/src/corners.cpp b/modules/cudaimgproc/src/corners.cpp
similarity index 100%
rename from modules/gpuimgproc/src/corners.cpp
rename to modules/cudaimgproc/src/corners.cpp

diff --git a/modules/gpuimgproc/src/cuda/bilateral_filter.cu b/modules/cudaimgproc/src/cuda/bilateral_filter.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/bilateral_filter.cu
rename to modules/cudaimgproc/src/cuda/bilateral_filter.cu

diff --git a/modules/gpuimgproc/src/cuda/blend.cu b/modules/cudaimgproc/src/cuda/blend.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/blend.cu
rename to modules/cudaimgproc/src/cuda/blend.cu

diff --git a/modules/gpuimgproc/src/cuda/build_point_list.cu b/modules/cudaimgproc/src/cuda/build_point_list.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/build_point_list.cu
rename to modules/cudaimgproc/src/cuda/build_point_list.cu

diff --git a/modules/gpuimgproc/src/cuda/canny.cu b/modules/cudaimgproc/src/cuda/canny.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/canny.cu
rename to modules/cudaimgproc/src/cuda/canny.cu

diff --git a/modules/gpuimgproc/src/cuda/clahe.cu b/modules/cudaimgproc/src/cuda/clahe.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/clahe.cu
rename to modules/cudaimgproc/src/cuda/clahe.cu

diff --git a/modules/gpuimgproc/src/cuda/color.cu b/modules/cudaimgproc/src/cuda/color.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/color.cu
rename to modules/cudaimgproc/src/cuda/color.cu

diff --git a/modules/gpuimgproc/src/cuda/corners.cu b/modules/cudaimgproc/src/cuda/corners.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/corners.cu
rename to modules/cudaimgproc/src/cuda/corners.cu

diff --git a/modules/gpuimgproc/src/cuda/debayer.cu b/modules/cudaimgproc/src/cuda/debayer.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/debayer.cu
rename to modules/cudaimgproc/src/cuda/debayer.cu

diff --git a/modules/gpuimgproc/src/cuda/generalized_hough.cu b/modules/cudaimgproc/src/cuda/generalized_hough.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/generalized_hough.cu
rename to modules/cudaimgproc/src/cuda/generalized_hough.cu

diff --git a/modules/gpuimgproc/src/cuda/gftt.cu b/modules/cudaimgproc/src/cuda/gftt.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/gftt.cu
rename to modules/cudaimgproc/src/cuda/gftt.cu

diff --git a/modules/gpuimgproc/src/cuda/hist.cu b/modules/cudaimgproc/src/cuda/hist.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/hist.cu
rename to modules/cudaimgproc/src/cuda/hist.cu

diff --git a/modules/gpuimgproc/src/cuda/hough_circles.cu b/modules/cudaimgproc/src/cuda/hough_circles.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/hough_circles.cu
rename to modules/cudaimgproc/src/cuda/hough_circles.cu

diff --git a/modules/gpuimgproc/src/cuda/hough_lines.cu b/modules/cudaimgproc/src/cuda/hough_lines.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/hough_lines.cu
rename to modules/cudaimgproc/src/cuda/hough_lines.cu

diff --git a/modules/gpuimgproc/src/cuda/hough_segments.cu b/modules/cudaimgproc/src/cuda/hough_segments.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/hough_segments.cu
rename to modules/cudaimgproc/src/cuda/hough_segments.cu

diff --git a/modules/gpuimgproc/src/cuda/match_template.cu b/modules/cudaimgproc/src/cuda/match_template.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/match_template.cu
rename to modules/cudaimgproc/src/cuda/match_template.cu

diff --git a/modules/gpuimgproc/src/cuda/mean_shift.cu b/modules/cudaimgproc/src/cuda/mean_shift.cu
similarity index 100%
rename from modules/gpuimgproc/src/cuda/mean_shift.cu
rename to modules/cudaimgproc/src/cuda/mean_shift.cu

diff --git a/modules/gpuimgproc/src/cvt_color_internal.h b/modules/cudaimgproc/src/cvt_color_internal.h
similarity index 100%
rename from modules/gpuimgproc/src/cvt_color_internal.h
rename to modules/cudaimgproc/src/cvt_color_internal.h

diff --git a/modules/gpuimgproc/src/generalized_hough.cpp b/modules/cudaimgproc/src/generalized_hough.cpp
similarity index 100%
rename from modules/gpuimgproc/src/generalized_hough.cpp
rename to modules/cudaimgproc/src/generalized_hough.cpp

diff --git a/modules/gpuimgproc/src/gftt.cpp b/modules/cudaimgproc/src/gftt.cpp
similarity index 100%
rename from modules/gpuimgproc/src/gftt.cpp
rename to modules/cudaimgproc/src/gftt.cpp

diff --git a/modules/gpuimgproc/src/histogram.cpp b/modules/cudaimgproc/src/histogram.cpp
similarity index 100%
rename from modules/gpuimgproc/src/histogram.cpp
rename to modules/cudaimgproc/src/histogram.cpp

diff --git a/modules/gpuimgproc/src/hough_circles.cpp b/modules/cudaimgproc/src/hough_circles.cpp
similarity index 100%
rename from modules/gpuimgproc/src/hough_circles.cpp
rename to modules/cudaimgproc/src/hough_circles.cpp

diff --git a/modules/gpuimgproc/src/hough_lines.cpp b/modules/cudaimgproc/src/hough_lines.cpp
similarity index 100%
rename from modules/gpuimgproc/src/hough_lines.cpp
rename to modules/cudaimgproc/src/hough_lines.cpp

diff --git a/modules/gpuimgproc/src/hough_segments.cpp b/modules/cudaimgproc/src/hough_segments.cpp
similarity index 100%
rename from modules/gpuimgproc/src/hough_segments.cpp
rename to modules/cudaimgproc/src/hough_segments.cpp

diff --git a/modules/gpuimgproc/src/match_template.cpp b/modules/cudaimgproc/src/match_template.cpp
similarity index 100%
rename from modules/gpuimgproc/src/match_template.cpp
rename to modules/cudaimgproc/src/match_template.cpp

diff --git a/modules/gpuimgproc/src/mean_shift.cpp b/modules/cudaimgproc/src/mean_shift.cpp
similarity index 100%
rename from modules/gpuimgproc/src/mean_shift.cpp
rename to modules/cudaimgproc/src/mean_shift.cpp

diff --git a/modules/gpuimgproc/src/mssegmentation.cpp b/modules/cudaimgproc/src/mssegmentation.cpp
similarity index 100%
rename from modules/gpuimgproc/src/mssegmentation.cpp
rename to modules/cudaimgproc/src/mssegmentation.cpp

diff --git a/modules/gpuimgproc/src/precomp.cpp b/modules/cudaimgproc/src/precomp.cpp
similarity index 100%
rename from modules/gpuimgproc/src/precomp.cpp
rename to modules/cudaimgproc/src/precomp.cpp

diff --git a/modules/gpuimgproc/src/precomp.hpp b/modules/cudaimgproc/src/precomp.hpp
similarity index 98%
rename from modules/gpuimgproc/src/precomp.hpp
rename to modules/cudaimgproc/src/precomp.hpp
index 093cd24..c31d6a3 100644 (file)
--- a/modules/gpuimgproc/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"

diff --git a/modules/gpuimgproc/test/test_bilateral_filter.cpp b/modules/cudaimgproc/test/test_bilateral_filter.cpp
similarity index 100%
rename from modules/gpuimgproc/test/test_bilateral_filter.cpp
rename to modules/cudaimgproc/test/test_bilateral_filter.cpp

diff --git a/modules/gpuimgproc/test/test_blend.cpp b/modules/cudaimgproc/test/test_blend.cpp
similarity index 100%
rename from modules/gpuimgproc/test/test_blend.cpp
rename to modules/cudaimgproc/test/test_blend.cpp

diff --git a/modules/gpuimgproc/test/test_canny.cpp b/modules/cudaimgproc/test/test_canny.cpp
similarity index 100%
rename from modules/gpuimgproc/test/test_canny.cpp
rename to modules/cudaimgproc/test/test_canny.cpp

diff --git a/modules/gpuimgproc/test/test_color.cpp b/modules/cudaimgproc/test/test_color.cpp
similarity index 100%
rename from modules/gpuimgproc/test/test_color.cpp
rename to modules/cudaimgproc/test/test_color.cpp

diff --git a/modules/gpuimgproc/test/test_corners.cpp b/modules/cudaimgproc/test/test_corners.cpp
similarity index 100%
rename from modules/gpuimgproc/test/test_corners.cpp
rename to modules/cudaimgproc/test/test_corners.cpp

diff --git a/modules/gpuimgproc/test/test_gftt.cpp b/modules/cudaimgproc/test/test_gftt.cpp
similarity index 100%
rename from modules/gpuimgproc/test/test_gftt.cpp
rename to modules/cudaimgproc/test/test_gftt.cpp

diff --git a/modules/gpuimgproc/test/test_histogram.cpp b/modules/cudaimgproc/test/test_histogram.cpp
similarity index 100%
rename from modules/gpuimgproc/test/test_histogram.cpp
rename to modules/cudaimgproc/test/test_histogram.cpp

diff --git a/modules/gpuimgproc/test/test_hough.cpp b/modules/cudaimgproc/test/test_hough.cpp
similarity index 100%
rename from modules/gpuimgproc/test/test_hough.cpp
rename to modules/cudaimgproc/test/test_hough.cpp

diff --git a/modules/gpuimgproc/test/test_main.cpp b/modules/cudaimgproc/test/test_main.cpp
similarity index 100%
rename from modules/gpuimgproc/test/test_main.cpp
rename to modules/cudaimgproc/test/test_main.cpp

diff --git a/modules/gpuimgproc/test/test_match_template.cpp b/modules/cudaimgproc/test/test_match_template.cpp
similarity index 100%
rename from modules/gpuimgproc/test/test_match_template.cpp
rename to modules/cudaimgproc/test/test_match_template.cpp

diff --git a/modules/gpuimgproc/test/test_mean_shift.cpp b/modules/cudaimgproc/test/test_mean_shift.cpp
similarity index 100%
rename from modules/gpuimgproc/test/test_mean_shift.cpp
rename to modules/cudaimgproc/test/test_mean_shift.cpp

diff --git a/modules/gpuimgproc/test/test_precomp.cpp b/modules/cudaimgproc/test/test_precomp.cpp
similarity index 100%
rename from modules/gpuimgproc/test/test_precomp.cpp
rename to modules/cudaimgproc/test/test_precomp.cpp

diff --git a/modules/gpuimgproc/test/test_precomp.hpp b/modules/cudaimgproc/test/test_precomp.hpp
similarity index 98%
rename from modules/gpuimgproc/test/test_precomp.hpp
rename to modules/cudaimgproc/test/test_precomp.hpp
index 7a8b1cb..a1acbd3 100644 (file)
--- a/modules/gpuimgproc/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"

diff --git a/modules/gpubgsegm/CMakeLists.txt b/modules/gpubgsegm/CMakeLists.txt
index c265be9..329bf14 100644 (file)
--- 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)

diff --git a/modules/gpubgsegm/perf/perf_bgsegm.cpp b/modules/gpubgsegm/perf/perf_bgsegm.cpp
index f6b59a3..fbd7191 100644 (file)
--- 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
-#  include "opencv2/gpuimgproc.hpp"
+#ifdef HAVE_OPENCV_CUDAIMGPROC
+#  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);

diff --git a/modules/gpubgsegm/src/fgd.cpp b/modules/gpubgsegm/src/fgd.cpp
index e46216a..46abf61 100644 (file)
--- 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(); }
 

diff --git a/modules/gpubgsegm/src/precomp.hpp b/modules/gpubgsegm/src/precomp.hpp
index 666fa75..469f543 100644 (file)
--- 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
-#  include "opencv2/gpuimgproc.hpp"
+#ifdef HAVE_OPENCV_CUDAIMGPROC
+#  include "opencv2/cudaimgproc.hpp"
 #endif
 
 #endif /* __OPENCV_PRECOMP_H__ */

diff --git a/modules/gpuimgproc/CMakeLists.txt b/modules/gpuimgproc/CMakeLists.txt
deleted file mode 100644 (file)
index b16345a..0000000
--- a/modules/gpuimgproc/CMakeLists.txt
+++ /dev/null
@@ -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)

diff --git a/modules/gpuoptflow/CMakeLists.txt b/modules/gpuoptflow/CMakeLists.txt
index 2d9ac3e..4bd3631 100644 (file)
--- 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)

diff --git a/modules/gpuoptflow/src/precomp.hpp b/modules/gpuoptflow/src/precomp.hpp
index a0a03f7..6eb7840 100644 (file)
--- 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"

diff --git a/modules/photo/CMakeLists.txt b/modules/photo/CMakeLists.txt
index ad04f0a..4694a8e 100644 (file)
--- 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)

diff --git a/modules/photo/perf/perf_gpu.cpp b/modules/photo/perf/perf_gpu.cpp
index 9ad29c4..db44678 100644 (file)
--- 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;

diff --git a/modules/photo/src/denoising_gpu.cpp b/modules/photo/src/denoising_gpu.cpp
index 13167d1..2d6406a 100644 (file)
--- 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
-#  include "opencv2/gpuimgproc.hpp"
+#ifdef HAVE_OPENCV_CUDAIMGPROC
+#  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(); }

diff --git a/modules/photo/test/test_denoising_gpu.cpp b/modules/photo/test/test_denoising_gpu.cpp
index b9363cd..b5f025d 100644 (file)
--- 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;
 

diff --git a/modules/superres/CMakeLists.txt b/modules/superres/CMakeLists.txt
index 97760f8..aec0ae1 100644 (file)
--- 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)

diff --git a/modules/superres/src/input_array_utility.cpp b/modules/superres/src/input_array_utility.cpp
index 2027eb6..5b87267 100644 (file)
--- 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");

diff --git a/modules/superres/src/precomp.hpp b/modules/superres/src/precomp.hpp
index 7d14d85..7b0d070 100644 (file)
--- 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
-#  include "opencv2/gpuimgproc.hpp"
+#ifdef HAVE_OPENCV_CUDAIMGPROC
+#  include "opencv2/cudaimgproc.hpp"
 #endif
 
 #ifdef HAVE_OPENCV_GPUOPTFLOW

diff --git a/modules/videostab/include/opencv2/videostab/global_motion.hpp b/modules/videostab/include/opencv2/videostab/global_motion.hpp
index d7cb274..3f26739 100644 (file)
--- 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
-#  include "opencv2/gpuimgproc.hpp"
+#ifdef HAVE_OPENCV_CUDAIMGPROC
+#  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);
 

diff --git a/modules/videostab/src/global_motion.cpp b/modules/videostab/src/global_motion.cpp
index 839e7c4..620d8df 100644 (file)
--- 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)

diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
index 279eafe..5f838ca 100644 (file)
--- 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)
-    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpuimgproc/include")
+  if(HAVE_opencv_cudaimgproc)
+    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/cudaimgproc/include")
   endif()
   if(HAVE_opencv_cudaarithm)
     ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/cudaarithm/include")

diff --git a/samples/cpp/videostab.cpp b/samples/cpp/videostab.cpp
index f8f21dd..0392ef5 100644 (file)
--- 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);

diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt
index ece15d5..1116a8f 100644 (file)
--- 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)
 

diff --git a/samples/gpu/alpha_comp.cpp b/samples/gpu/alpha_comp.cpp
index a59f559..816c0a7 100644 (file)
--- 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;

diff --git a/samples/gpu/cascadeclassifier.cpp b/samples/gpu/cascadeclassifier.cpp
index 34d317c..1419632 100644 (file)
--- 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;

diff --git a/samples/gpu/generalized_hough.cpp b/samples/gpu/generalized_hough.cpp
index ff91c7c..6803bf9 100644 (file)
--- 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"
 

diff --git a/samples/gpu/houghlines.cpp b/samples/gpu/houghlines.cpp
index a789fd1..29dc69c 100644 (file)
--- 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;

diff --git a/samples/gpu/morphology.cpp b/samples/gpu/morphology.cpp
index 5261e06..c6a64a1 100644 (file)
--- 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;

diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp
index 42c91f1..df0d65a 100644 (file)
--- 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"

diff --git a/samples/gpu/pyrlk_optical_flow.cpp b/samples/gpu/pyrlk_optical_flow.cpp
index a7ac194..a1f22b3 100644 (file)
--- 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;