renamed gpuimgproc -> cudaimgproc

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)

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__ */

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)

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

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"

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"

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)

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);

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(); }
 

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__ */

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)

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)

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"

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)

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;

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(); }

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;
 

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)

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");

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

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);
 

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)

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")

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);

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)
 

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;

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;

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"
 

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;

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;

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"

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;