renamed gpu* source to cuda* in core module

modules/core/include/opencv2/core/gpu.hpp → modules/core/include/opencv2/core/cuda.hpp

@@ -45,11 +45,11 @@
 #define __OPENCV_CORE_GPU_HPP__
 
 #ifndef __cplusplus
-#  error gpu.hpp header must be compiled as C++
+#  error cuda.hpp header must be compiled as C++
 #endif
 
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu_types.hpp"
+#include "opencv2/core/cuda_types.hpp"
 
 namespace cv { namespace cuda {
 
@@ -673,6 +673,6 @@ template <> CV_EXPORTS void Ptr<cv::cuda::Event::Impl>::delete_obj();
 
 }
 
-#include "opencv2/core/gpu.inl.hpp"
+#include "opencv2/core/cuda.inl.hpp"
 
 #endif /* __OPENCV_CORE_GPU_HPP__ */

modules/core/include/opencv2/core/gpu.inl.hpp → modules/core/include/opencv2/core/cuda.inl.hpp

@@ -44,7 +44,7 @@
 #ifndef __OPENCV_CORE_GPUINL_HPP__
 #define __OPENCV_CORE_GPUINL_HPP__
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace cuda {
 

modules/core/include/opencv2/core/cuda/common.hpp

@@ -44,7 +44,7 @@
 #define __OPENCV_GPU_COMMON_HPP__
 
 #include <cuda_runtime.h>
-#include "opencv2/core/gpu_types.hpp"
+#include "opencv2/core/cuda_types.hpp"
 #include "opencv2/core/cvdef.h"
 #include "opencv2/core/base.hpp"
 

modules/core/include/opencv2/core/gpu_stream_accessor.hpp → modules/core/include/opencv2/core/cuda_stream_accessor.hpp

@@ -44,7 +44,7 @@
 #define __OPENCV_CORE_GPU_STREAM_ACCESSOR_HPP__
 
 #ifndef __cplusplus
-#  error gpu_stream_accessor.hpp header must be compiled as C++
+#  error cuda_stream_accessor.hpp header must be compiled as C++
 #endif
 
 // This is only header file that depends on Cuda. All other headers are independent.

modules/core/include/opencv2/core/gpu_types.hpp → modules/core/include/opencv2/core/cuda_types.hpp

@@ -44,7 +44,7 @@
 #define __OPENCV_CORE_GPU_TYPES_HPP__
 
 #ifndef __cplusplus
-#  error gpu_types.hpp header must be compiled as C++
+#  error cuda_types.hpp header must be compiled as C++
 #endif
 
 #ifdef __CUDACC__

modules/core/include/opencv2/core/private.gpu.hpp → modules/core/include/opencv2/core/private.cuda.hpp

@@ -53,13 +53,13 @@
 #include "opencv2/core/cvdef.h"
 #include "opencv2/core/base.hpp"
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 #ifdef HAVE_CUDA
 #  include <cuda.h>
 #  include <cuda_runtime.h>
 #  include <npp.h>
-#  include "opencv2/core/gpu_stream_accessor.hpp"
+#  include "opencv2/core/cuda_stream_accessor.hpp"
 #  include "opencv2/core/cuda/common.hpp"
 
 #  define NPP_VERSION (NPP_VERSION_MAJOR * 1000 + NPP_VERSION_MINOR * 100 + NPP_VERSION_BUILD)

modules/core/src/cuda/gpu_mat.cu

@@ -48,7 +48,7 @@
 
 #else
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/cudev.hpp"
 
 using namespace cv;

modules/core/src/precomp.hpp

@@ -45,11 +45,11 @@
 
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/core_c.h"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/core/opengl.hpp"
 
 #include "opencv2/core/private.hpp"
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include <assert.h>
 #include <ctype.h>

modules/cudev/include/opencv2/cudev/common.hpp

@@ -47,8 +47,8 @@
 #define __OPENCV_CUDEV_COMMON_HPP__
 
 #include <cuda_runtime.h>
-#include "opencv2/core/gpu.hpp"
-#include "opencv2/core/gpu_stream_accessor.hpp"
+#include "opencv2/core/cuda.hpp"
+#include "opencv2/core/cuda_stream_accessor.hpp"
 
 namespace cv { namespace cudev {
 

modules/gpu/include/opencv2/gpu.hpp

@@ -44,10 +44,10 @@
 #define __OPENCV_GPU_HPP__
 
 #ifndef __cplusplus
-#  error gpu.hpp header must be compiled as C++
+#  error cuda.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace cuda {
 

modules/gpu/src/precomp.hpp

@@ -49,7 +49,7 @@
 #include "opencv2/calib3d.hpp"
 #include "opencv2/objdetect.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 

modules/gpuarithm/include/opencv2/gpuarithm.hpp

@@ -47,7 +47,7 @@
 #  error gpuarithm.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace cuda {
 

modules/gpuarithm/src/precomp.hpp

@@ -50,7 +50,7 @@
 #include "opencv2/gpuarithm.hpp"
 #include "opencv2/core/utility.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 

modules/gpubgsegm/include/opencv2/gpubgsegm.hpp

@@ -47,7 +47,7 @@
 #  error gpubgsegm.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/video/background_segm.hpp"
 
 namespace cv { namespace cuda {

modules/gpubgsegm/src/cuda/fgd.hpp

@@ -43,7 +43,7 @@
 #ifndef __FGD_BGFG_COMMON_HPP__
 #define __FGD_BGFG_COMMON_HPP__
 
-#include "opencv2/core/gpu_types.hpp"
+#include "opencv2/core/cuda_types.hpp"
 
 namespace fgd
 {

modules/gpubgsegm/src/precomp.hpp

@@ -47,7 +47,7 @@
 
 #include "opencv2/gpubgsegm.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 

modules/gpucodec/include/opencv2/gpucodec.hpp

@@ -48,7 +48,7 @@
 #  error gpucodec.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace cudacodec {
 

modules/gpucodec/src/cuvid_video_source.hpp

@@ -46,7 +46,7 @@
 
 #include <nvcuvid.h>
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 #include "opencv2/gpucodec.hpp"
 #include "video_source.hpp"
 

modules/gpucodec/src/frame_queue.hpp

@@ -45,7 +45,7 @@
 #define __FRAME_QUEUE_HPP__
 
 #include "opencv2/core/utility.hpp"
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include <nvcuvid.h>
 

modules/gpucodec/src/precomp.hpp

@@ -53,7 +53,7 @@
 
 #include "opencv2/gpucodec.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #ifdef HAVE_NVCUVID
     #include <nvcuvid.h>

modules/gpucodec/src/video_decoder.hpp

@@ -46,7 +46,7 @@
 
 #include <nvcuvid.h>
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 #include "opencv2/gpucodec.hpp"
 
 namespace cv { namespace cudacodec { namespace detail

modules/gpucodec/src/video_parser.hpp

@@ -46,7 +46,7 @@
 
 #include <nvcuvid.h>
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 #include "opencv2/gpucodec.hpp"
 #include "frame_queue.hpp"
 #include "video_decoder.hpp"

modules/gpucodec/src/video_source.hpp

@@ -44,7 +44,7 @@
 #ifndef __GPUCODEC_VIDEO_SOURCE_H__
 #define __GPUCODEC_VIDEO_SOURCE_H__
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 #include "opencv2/gpucodec.hpp"
 #include "thread.hpp"
 

modules/gpufeatures2d/include/opencv2/gpufeatures2d.hpp

@@ -47,7 +47,7 @@
 #  error gpufeatures2d.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/gpufilters.hpp"
 
 namespace cv { namespace cuda {

modules/gpufeatures2d/src/precomp.hpp

@@ -52,6 +52,6 @@
 #include "opencv2/gpuwarping.hpp"
 #include "opencv2/features2d.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #endif /* __OPENCV_PRECOMP_H__ */

modules/gpufilters/include/opencv2/gpufilters.hpp

@@ -47,7 +47,7 @@
 #  error gpufilters.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/imgproc.hpp"
 
 namespace cv { namespace cuda {

modules/gpufilters/src/precomp.hpp

@@ -49,6 +49,6 @@
 #include "opencv2/gpuarithm.hpp"
 #include "opencv2/imgproc.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #endif /* __OPENCV_PRECOMP_H__ */

modules/gpuimgproc/include/opencv2/gpuimgproc.hpp

@@ -47,7 +47,7 @@
 #  error gpuimgproc.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/imgproc.hpp"
 
 namespace cv { namespace cuda {

modules/gpuimgproc/src/precomp.hpp

@@ -47,7 +47,7 @@
 
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/private.hpp"
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 

modules/gpulegacy/include/opencv2/gpulegacy/private.hpp

@@ -48,7 +48,7 @@
 #  error this is a private header which should not be used from outside of the OpenCV library
 #endif
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #ifndef HAVE_CUDA
 #  error gpulegacy module requires CUDA

modules/gpulegacy/src/precomp.hpp

@@ -56,7 +56,7 @@
 #  include "opencv2/objdetect.hpp"
 #endif
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 #include "opencv2/gpulegacy/private.hpp"
 
 #endif /* __OPENCV_PRECOMP_H__ */

modules/gpulegacy/test/test_precomp.hpp

@@ -68,11 +68,11 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_test.hpp"
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/gpulegacy.hpp"
 #include "opencv2/highgui.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "cvconfig.h"
 

modules/gpuoptflow/include/opencv2/gpuoptflow.hpp

@@ -47,7 +47,7 @@
 #  error gpuoptflow.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace cuda {
 

modules/gpuoptflow/src/precomp.hpp

@@ -51,7 +51,7 @@
 #include "opencv2/gpuimgproc.hpp"
 #include "opencv2/video.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 

modules/gpustereo/include/opencv2/gpustereo.hpp

@@ -47,7 +47,7 @@
 #  error gpustereo.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/calib3d.hpp"
 
 namespace cv { namespace cuda {

modules/gpustereo/src/precomp.hpp

@@ -47,7 +47,7 @@
 
 #include "opencv2/gpustereo.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 #include "opencv2/core/utility.hpp"
 
 #endif /* __OPENCV_PRECOMP_H__ */

modules/gpuwarping/include/opencv2/gpuwarping.hpp

@@ -47,7 +47,7 @@
 #  error gpuwarping.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/imgproc.hpp"
 
 namespace cv { namespace cuda {

modules/gpuwarping/src/precomp.hpp

@@ -45,7 +45,7 @@
 
 #include "opencv2/gpuwarping.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 

modules/nonfree/include/opencv2/nonfree/gpu.hpp

@@ -43,7 +43,7 @@
 #ifndef __OPENCV_NONFREE_GPU_HPP__
 #define __OPENCV_NONFREE_GPU_HPP__
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace cuda {
 

modules/nonfree/src/precomp.hpp

@@ -50,7 +50,7 @@
 #include "opencv2/core/private.hpp"
 
 #include "opencv2/nonfree/gpu.hpp"
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 

modules/photo/include/opencv2/photo/gpu.hpp

@@ -43,7 +43,7 @@
 #ifndef __OPENCV_PHOTO_GPU_HPP__
 #define __OPENCV_PHOTO_GPU_HPP__
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace cuda {
 

modules/photo/src/denoising_gpu.cpp

@@ -43,7 +43,7 @@
 #include "precomp.hpp"
 
 #include "opencv2/photo/gpu.hpp"
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 

modules/softcascade/include/opencv2/softcascade.hpp

@@ -46,7 +46,7 @@
 #include <iosfwd>
 
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace softcascade {
 

modules/softcascade/src/cuda/channels.cu

@@ -40,7 +40,7 @@
 //
 //M*/
 
-#include "opencv2/core/gpu_types.hpp"
+#include "opencv2/core/cuda_types.hpp"
 #include "opencv2/core/cuda/common.hpp"
 
 namespace cv { namespace softcascade { namespace cudev

modules/softcascade/src/cuda_invoker.hpp

@@ -44,7 +44,7 @@
 #ifndef __OPENCV_ICF_HPP__
 #define __OPENCV_ICF_HPP__
 
-#include "opencv2/core/gpu_types.hpp"
+#include "opencv2/core/cuda_types.hpp"
 #include "cuda_runtime_api.h"
 
 #if defined __CUDACC__

modules/softcascade/src/precomp.hpp

@@ -49,7 +49,7 @@
 #include "opencv2/imgproc.hpp"
 
 #include "opencv2/core/private.hpp"
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 namespace cv { namespace softcascade { namespace internal
 {

modules/softcascade/test/test_cuda_softcascade.cpp

@@ -41,7 +41,7 @@
 //M*/
 
 #include "test_precomp.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 
 #ifdef HAVE_CUDA

modules/softcascade/test/utility.hpp

@@ -43,7 +43,7 @@
 #define __OPENCV_SOFTCASCADE_TEST_UTILITY_HPP__
 
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/ts.hpp"
 
 //////////////////////////////////////////////////////////////////////

modules/stitching/include/opencv2/stitching/detail/warpers.hpp

@@ -44,7 +44,7 @@
 #define __OPENCV_STITCHING_WARPERS_HPP__
 
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/opencv_modules.hpp"
 

modules/superres/perf/perf_precomp.hpp

@@ -52,7 +52,7 @@
 #define __OPENCV_PERF_PRECOMP_HPP__
 
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_perf.hpp"
 #include "opencv2/superres.hpp"

modules/superres/src/input_array_utility.hpp

@@ -44,7 +44,7 @@
 #define __OPENCV_SUPERRES_INPUT_ARRAY_UTILITY_HPP__
 
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #ifdef HAVE_OPENCV_OCL
 #include "opencv2/ocl.hpp"
 #endif

modules/superres/src/precomp.hpp

@@ -48,14 +48,14 @@
 
 #include "opencv2/opencv_modules.hpp"
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/core/opengl.hpp"
 #include "opencv2/core/utility.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/video/tracking.hpp"
 #include "opencv2/core/private.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #ifdef HAVE_OPENCV_GPUARITHM
 #  include "opencv2/gpuarithm.hpp"

modules/ts/include/opencv2/ts/gpu_test.hpp

@@ -46,7 +46,7 @@
 #include <stdexcept>
 #include "cvconfig.h"
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/ts.hpp"

modules/ts/src/gpu_perf.cpp

@@ -42,7 +42,7 @@
 
 #include "precomp.hpp"
 #include "opencv2/ts/gpu_perf.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 #ifdef HAVE_CUDA
     #include <cuda_runtime.h>

modules/ts/src/ts_perf.cpp

 #include "precomp.hpp"
 
 #ifdef HAVE_CUDA
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #endif
 
 #ifdef ANDROID

modules/videostab/include/opencv2/videostab/wobble_suppression.hpp

@@ -45,7 +45,7 @@
 
 #include <vector>
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/videostab/global_motion.hpp"
 #include "opencv2/videostab/log.hpp"
 

samples/gpu/cascadeclassifier_nvidia_api.cpp

@@ -6,7 +6,7 @@
 #include <iostream>
 #include <iomanip>
 #include <cstdio>
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/gpulegacy.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"

samples/gpu/opengl.cpp

@@ -25,7 +25,7 @@ int main()
 
 #include "opencv2/core/core.hpp"
 #include "opencv2/core/opengl.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
 using namespace std;

samples/gpu/opticalflow_nvidia_api.cpp

@@ -11,7 +11,7 @@
 #include "cvconfig.h"
 #include <iostream>
 #include <iomanip>
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/gpulegacy.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/highgui/highgui_c.h"