moved device layer to core module

modules/gpu/src/cuda/NV12ToARGB.cu

@@ -49,7 +49,7 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
+#include "opencv2/core/device/common.hpp"
 
 namespace cv { namespace gpu { namespace device {
     namespace video_decoding

modules/gpu/src/cuda/bf_knnmatch.cu

@@ -42,13 +42,13 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/utility.hpp"
-#include "opencv2/gpu/device/reduce.hpp"
-#include "opencv2/gpu/device/limits.hpp"
-#include "opencv2/gpu/device/vec_distance.hpp"
-#include "opencv2/gpu/device/datamov_utils.hpp"
-#include "opencv2/gpu/device/warp_shuffle.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/utility.hpp"
+#include "opencv2/core/device/reduce.hpp"
+#include "opencv2/core/device/limits.hpp"
+#include "opencv2/core/device/vec_distance.hpp"
+#include "opencv2/core/device/datamov_utils.hpp"
+#include "opencv2/core/device/warp_shuffle.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/bf_match.cu

@@ -42,12 +42,12 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/utility.hpp"
-#include "opencv2/gpu/device/reduce.hpp"
-#include "opencv2/gpu/device/limits.hpp"
-#include "opencv2/gpu/device/vec_distance.hpp"
-#include "opencv2/gpu/device/datamov_utils.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/utility.hpp"
+#include "opencv2/core/device/reduce.hpp"
+#include "opencv2/core/device/limits.hpp"
+#include "opencv2/core/device/vec_distance.hpp"
+#include "opencv2/core/device/datamov_utils.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/bf_radius_match.cu

@@ -42,11 +42,11 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/utility.hpp"
-#include "opencv2/gpu/device/limits.hpp"
-#include "opencv2/gpu/device/vec_distance.hpp"
-#include "opencv2/gpu/device/datamov_utils.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/utility.hpp"
+#include "opencv2/core/device/limits.hpp"
+#include "opencv2/core/device/vec_distance.hpp"
+#include "opencv2/core/device/datamov_utils.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/bgfg_gmg.cu

@@ -42,9 +42,9 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/vec_traits.hpp"
-#include "opencv2/gpu/device/limits.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/vec_traits.hpp"
+#include "opencv2/core/device/limits.hpp"
 
 namespace cv { namespace gpu { namespace device {
     namespace bgfg_gmg

modules/gpu/src/cuda/bgfg_mog.cu

@@ -42,10 +42,10 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/vec_traits.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/limits.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/vec_traits.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/limits.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/bilateral_filter.cu

@@ -42,10 +42,10 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/vec_traits.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/border_interpolate.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/vec_traits.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/border_interpolate.hpp"
 
 using namespace cv::gpu;
 

modules/gpu/src/cuda/blend.cu

@@ -42,7 +42,7 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
+#include "opencv2/core/device/common.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/calib3d.cu

@@ -42,10 +42,10 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/transform.hpp"
-#include "opencv2/gpu/device/functional.hpp"
-#include "opencv2/gpu/device/reduce.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/transform.hpp"
+#include "opencv2/core/device/functional.hpp"
+#include "opencv2/core/device/reduce.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/canny.cu

@@ -44,11 +44,11 @@
 
 #include <utility>
 #include <algorithm>//std::swap
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/emulation.hpp"
-#include "opencv2/gpu/device/transform.hpp"
-#include "opencv2/gpu/device/functional.hpp"
-#include "opencv2/gpu/device/utility.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/emulation.hpp"
+#include "opencv2/core/device/transform.hpp"
+#include "opencv2/core/device/functional.hpp"
+#include "opencv2/core/device/utility.hpp"
 
 using namespace cv::gpu;
 using namespace cv::gpu::device;

modules/gpu/src/cuda/ccomponetns.cu

@@ -42,10 +42,10 @@
 
 #if !defined CUDA_DISABLER
 
-#include <opencv2/gpu/device/common.hpp>
-#include <opencv2/gpu/device/vec_traits.hpp>
-#include <opencv2/gpu/device/vec_math.hpp>
-#include <opencv2/gpu/device/emulation.hpp>
+#include <opencv2/core/device/common.hpp>
+#include <opencv2/core/device/vec_traits.hpp>
+#include <opencv2/core/device/vec_math.hpp>
+#include <opencv2/core/device/emulation.hpp>
 
 #include <iostream>
 #include <stdio.h>

modules/gpu/src/cuda/clahe.cu

@@ -42,12 +42,12 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/functional.hpp"
-#include "opencv2/gpu/device/emulation.hpp"
-#include "opencv2/gpu/device/scan.hpp"
-#include "opencv2/gpu/device/reduce.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/functional.hpp"
+#include "opencv2/core/device/emulation.hpp"
+#include "opencv2/core/device/scan.hpp"
+#include "opencv2/core/device/reduce.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
 
 using namespace cv::gpu;
 using namespace cv::gpu::device;

modules/gpu/src/cuda/color.cu

@@ -42,9 +42,9 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/transform.hpp"
-#include "opencv2/gpu/device/color.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/transform.hpp"
+#include "opencv2/core/device/color.hpp"
 #include "cvt_color_internal.h"
 
 namespace cv { namespace gpu { namespace device

modules/gpu/src/cuda/column_filter.h

@@ -40,10 +40,10 @@
 //
 //M*/
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/border_interpolate.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/border_interpolate.hpp"
 
 using namespace cv::gpu;
 using namespace cv::gpu::device;

modules/gpu/src/cuda/copy_make_border.cu

@@ -42,8 +42,8 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/border_interpolate.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/border_interpolate.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/debayer.cu

@@ -42,12 +42,12 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/vec_traits.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/limits.hpp"
-#include "opencv2/gpu/device/color.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/vec_traits.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/limits.hpp"
+#include "opencv2/core/device/color.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/disp_bilateral_filter.cu

@@ -42,8 +42,8 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/limits.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/limits.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/element_operations.cu

@@ -42,13 +42,13 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/functional.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/transform.hpp"
-#include "opencv2/gpu/device/limits.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
-#include "opencv2/gpu/device/simd_functions.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/functional.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/transform.hpp"
+#include "opencv2/core/device/limits.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
+#include "opencv2/core/device/simd_functions.hpp"
 
 using namespace cv::gpu;
 using namespace cv::gpu::device;

modules/gpu/src/cuda/fast.cu

@@ -42,8 +42,8 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/utility.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/utility.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/fgd_bgfg.cu

@@ -42,12 +42,12 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/limits.hpp"
-#include "opencv2/gpu/device/utility.hpp"
-#include "opencv2/gpu/device/reduce.hpp"
-#include "opencv2/gpu/device/functional.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/limits.hpp"
+#include "opencv2/core/device/utility.hpp"
+#include "opencv2/core/device/reduce.hpp"
+#include "opencv2/core/device/functional.hpp"
 #include "fgd_bgfg_common.hpp"
 
 using namespace cv::gpu;

modules/gpu/src/cuda/gftt.cu

@@ -45,8 +45,8 @@
 #include <thrust/device_ptr.h>
 #include <thrust/sort.h>
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/utility.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/utility.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/global_motion.cu

@@ -45,7 +45,7 @@
 #include <thrust/device_ptr.h>
 #include <thrust/remove.h>
 #include <thrust/functional.h>
-#include "opencv2/gpu/device/common.hpp"
+#include "opencv2/core/device/common.hpp"
 
 namespace cv { namespace gpu { namespace device { namespace globmotion {
 

modules/gpu/src/cuda/hist.cu

@@ -42,10 +42,10 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/functional.hpp"
-#include "opencv2/gpu/device/emulation.hpp"
-#include "opencv2/gpu/device/transform.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/functional.hpp"
+#include "opencv2/core/device/emulation.hpp"
+#include "opencv2/core/device/transform.hpp"
 
 using namespace cv::gpu;
 using namespace cv::gpu::device;

modules/gpu/src/cuda/hog.cu

@@ -42,10 +42,10 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/reduce.hpp"
-#include "opencv2/gpu/device/functional.hpp"
-#include "opencv2/gpu/device/warp_shuffle.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/reduce.hpp"
+#include "opencv2/core/device/functional.hpp"
+#include "opencv2/core/device/warp_shuffle.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/hough.cu

@@ -45,11 +45,11 @@
 #include <thrust/device_ptr.h>
 #include <thrust/sort.h>
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/emulation.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/limits.hpp"
-#include "opencv2/gpu/device/dynamic_smem.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/emulation.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/limits.hpp"
+#include "opencv2/core/device/dynamic_smem.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/imgproc.cu

@@ -42,11 +42,11 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/vec_traits.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
-#include "opencv2/gpu/device/border_interpolate.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/vec_traits.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
+#include "opencv2/core/device/border_interpolate.hpp"
 #include "internal_shared.hpp"
 
 namespace cv { namespace gpu { namespace device

modules/gpu/src/cuda/integral_image.cu

@@ -42,7 +42,7 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
+#include "opencv2/core/device/common.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/internal_shared.hpp

@@ -48,7 +48,7 @@
 #include "NPP_staging.hpp"
 #include "opencv2/gpu/devmem2d.hpp"
 #include "safe_call.hpp"
-#include "opencv2/gpu/device/common.hpp"
+#include "opencv2/core/device/common.hpp"
 
 namespace cv { namespace gpu
 {

modules/gpu/src/cuda/lbp.cu

@@ -43,8 +43,8 @@
 #if !defined CUDA_DISABLER
 
 #include "lbp.hpp"
-#include "opencv2/gpu/device/vec_traits.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
+#include "opencv2/core/device/vec_traits.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/lbp.hpp

@@ -43,8 +43,8 @@
 #ifndef __OPENCV_GPU_DEVICE_LBP_HPP_
 #define __OPENCV_GPU_DEVICE_LBP_HPP_
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/emulation.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/emulation.hpp"
 
 namespace cv { namespace gpu { namespace device {
 

modules/gpu/src/cuda/match_template.cu

@@ -42,8 +42,8 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/vec_math.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/mathfunc.cu

@@ -42,7 +42,7 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
+#include "opencv2/core/device/common.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/matrix_reductions.cu

@@ -42,15 +42,15 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/limits.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
-#include "opencv2/gpu/device/vec_traits.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/reduce.hpp"
-#include "opencv2/gpu/device/functional.hpp"
-#include "opencv2/gpu/device/utility.hpp"
-#include "opencv2/gpu/device/type_traits.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/limits.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
+#include "opencv2/core/device/vec_traits.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/reduce.hpp"
+#include "opencv2/core/device/functional.hpp"
+#include "opencv2/core/device/utility.hpp"
+#include "opencv2/core/device/type_traits.hpp"
 
 using namespace cv::gpu;
 using namespace cv::gpu::device;

modules/gpu/src/cuda/nlm.cu

@@ -42,12 +42,12 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/vec_traits.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/functional.hpp"
-#include "opencv2/gpu/device/reduce.hpp"
-#include "opencv2/gpu/device/border_interpolate.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/vec_traits.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/functional.hpp"
+#include "opencv2/core/device/reduce.hpp"
+#include "opencv2/core/device/border_interpolate.hpp"
 
 using namespace cv::gpu;
 

modules/gpu/src/cuda/optflowbm.cu

@@ -42,10 +42,10 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/limits.hpp"
-#include "opencv2/gpu/device/functional.hpp"
-#include "opencv2/gpu/device/reduce.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/limits.hpp"
+#include "opencv2/core/device/functional.hpp"
+#include "opencv2/core/device/reduce.hpp"
 
 using namespace cv::gpu;
 using namespace cv::gpu::device;

modules/gpu/src/cuda/optical_flow.cu

@@ -42,7 +42,7 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
+#include "opencv2/core/device/common.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/optical_flow_farneback.cu

@@ -42,8 +42,8 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/border_interpolate.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/border_interpolate.hpp"
 
 #define tx threadIdx.x
 #define ty threadIdx.y

modules/gpu/src/cuda/orb.cu

@@ -45,9 +45,9 @@
 #include <thrust/device_ptr.h>
 #include <thrust/sort.h>
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/reduce.hpp"
-#include "opencv2/gpu/device/functional.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/reduce.hpp"
+#include "opencv2/core/device/functional.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/pyr_down.cu

@@ -42,11 +42,11 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/border_interpolate.hpp"
-#include "opencv2/gpu/device/vec_traits.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/border_interpolate.hpp"
+#include "opencv2/core/device/vec_traits.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/pyr_up.cu

@@ -42,11 +42,11 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/border_interpolate.hpp"
-#include "opencv2/gpu/device/vec_traits.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/border_interpolate.hpp"
+#include "opencv2/core/device/vec_traits.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/pyrlk.cu

@@ -42,12 +42,12 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/utility.hpp"
-#include "opencv2/gpu/device/functional.hpp"
-#include "opencv2/gpu/device/limits.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/reduce.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/utility.hpp"
+#include "opencv2/core/device/functional.hpp"
+#include "opencv2/core/device/limits.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/reduce.hpp"
 
 using namespace cv::gpu;
 using namespace cv::gpu::device;

modules/gpu/src/cuda/remap.cu

@@ -42,12 +42,12 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/border_interpolate.hpp"
-#include "opencv2/gpu/device/vec_traits.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
-#include "opencv2/gpu/device/filters.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/border_interpolate.hpp"
+#include "opencv2/core/device/vec_traits.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
+#include "opencv2/core/device/filters.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/resize.cu

@@ -43,13 +43,13 @@
 #if !defined CUDA_DISABLER
 
 #include <cfloat>
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/border_interpolate.hpp"
-#include "opencv2/gpu/device/vec_traits.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
-#include "opencv2/gpu/device/filters.hpp"
-#include "opencv2/gpu/device/scan.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/border_interpolate.hpp"
+#include "opencv2/core/device/vec_traits.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
+#include "opencv2/core/device/filters.hpp"
+#include "opencv2/core/device/scan.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/rgb_to_yv12.cu

@@ -42,8 +42,8 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/vec_traits.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/vec_traits.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/row_filter.h

@@ -40,10 +40,10 @@
 //
 //M*/
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/border_interpolate.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/border_interpolate.hpp"
 
 using namespace cv::gpu;
 using namespace cv::gpu::device;

modules/gpu/src/cuda/split_merge.cu

@@ -42,7 +42,7 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
+#include "opencv2/core/device/common.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/stereobm.cu

@@ -42,7 +42,7 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
+#include "opencv2/core/device/common.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/stereobp.cu

@@ -42,9 +42,9 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
-#include "opencv2/gpu/device/limits.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
+#include "opencv2/core/device/limits.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/stereocsbp.cu

@@ -42,11 +42,11 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
-#include "opencv2/gpu/device/limits.hpp"
-#include "opencv2/gpu/device/reduce.hpp"
-#include "opencv2/gpu/device/functional.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
+#include "opencv2/core/device/limits.hpp"
+#include "opencv2/core/device/reduce.hpp"
+#include "opencv2/core/device/functional.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/cuda/tvl1flow.cu

@@ -42,9 +42,9 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/border_interpolate.hpp"
-#include "opencv2/gpu/device/limits.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/border_interpolate.hpp"
+#include "opencv2/core/device/limits.hpp"
 
 using namespace cv::gpu;
 using namespace cv::gpu::device;

modules/gpu/src/cuda/warp.cu

@@ -42,12 +42,12 @@
 
 #if !defined CUDA_DISABLER
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/border_interpolate.hpp"
-#include "opencv2/gpu/device/vec_traits.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
-#include "opencv2/gpu/device/filters.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/border_interpolate.hpp"
+#include "opencv2/core/device/vec_traits.hpp"
+#include "opencv2/core/device/vec_math.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
+#include "opencv2/core/device/filters.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu

@@ -65,7 +65,7 @@
 
 #include "NPP_staging/NPP_staging.hpp"
 #include "NCVBroxOpticalFlow.hpp"
-#include "opencv2/gpu/device/utility.hpp"
+#include "opencv2/core/device/utility.hpp"
 
 
 typedef NCVVectorAlloc<Ncv32f> FloatVector;

modules/gpu/src/nvidia/NCVHaarObjectDetection.cu

@@ -66,8 +66,8 @@
 #include "NPP_staging/NPP_staging.hpp"
 #include "NCVRuntimeTemplates.hpp"
 #include "NCVHaarObjectDetection.hpp"
-#include "opencv2/gpu/device/warp.hpp"
-#include "opencv2/gpu/device/warp_shuffle.hpp"
+#include "opencv2/core/device/warp.hpp"
+#include "opencv2/core/device/warp_shuffle.hpp"
 
 
 //==============================================================================

modules/gpu/src/nvidia/NPP_staging/NPP_staging.cu

@@ -45,8 +45,8 @@
 #include <vector>
 #include <cuda_runtime.h>
 #include "NPP_staging.hpp"
-#include "opencv2/gpu/device/warp.hpp"
-#include "opencv2/gpu/device/warp_shuffle.hpp"
+#include "opencv2/core/device/warp.hpp"
+#include "opencv2/core/device/warp_shuffle.hpp"
 
 
 texture<Ncv8u,  1, cudaReadModeElementType> tex8u;

modules/gpu/src/nvidia/core/NCVPyramid.cu

@@ -48,7 +48,7 @@
 #include "NCVAlg.hpp"
 #include "NCVPyramid.hpp"
 #include "NCVPixelOperations.hpp"
-#include "opencv2/gpu/device/common.hpp"
+#include "opencv2/core/device/common.hpp"
 
 template<typename T, Ncv32u CN> struct __average4_CN {static __host__ __device__ T _average4_CN(const T &p00, const T &p01, const T &p10, const T &p11);};