moved device layer to core module

diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt
index e538d1a..6b5c3ac 100644 (file)
--- a/modules/core/CMakeLists.txt
+++ b/modules/core/CMakeLists.txt
@@ -1,12 +1,16 @@
 set(the_description "The Core Functionality")
 ocv_add_module(core ${ZLIB_LIBRARIES})
-ocv_module_include_directories(${ZLIB_INCLUDE_DIR} "${OpenCV_SOURCE_DIR}/modules/gpu/include")
+ocv_module_include_directories(${ZLIB_INCLUDE_DIR})
 
 if(HAVE_CUDA)
   ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
 endif()
 
-ocv_glob_module_sources(SOURCES "${opencv_core_BINARY_DIR}/version_string.inc")
+file(GLOB lib_device_hdrs        "include/opencv2/${name}/device/*.hpp"        "include/opencv2/${name}/device/*.h")
+file(GLOB lib_device_hdrs_detail "include/opencv2/${name}/device/detail/*.hpp" "include/opencv2/${name}/device/detail/*.h")
+ocv_glob_module_sources(SOURCES "${opencv_core_BINARY_DIR}/version_string.inc"
+                        HEADERS ${lib_device_hdrs} ${lib_device_hdrs_detail})
+
 ocv_create_module()
 ocv_add_precompiled_headers(${the_module})
 

diff --git a/modules/gpu/include/opencv2/gpu/device/block.hpp b/modules/core/include/opencv2/core/device/block.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/block.hpp
rename to modules/core/include/opencv2/core/device/block.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/border_interpolate.hpp b/modules/core/include/opencv2/core/device/border_interpolate.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/border_interpolate.hpp
rename to modules/core/include/opencv2/core/device/border_interpolate.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/color.hpp b/modules/core/include/opencv2/core/device/color.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/color.hpp
rename to modules/core/include/opencv2/core/device/color.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/common.hpp b/modules/core/include/opencv2/core/device/common.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/common.hpp
rename to modules/core/include/opencv2/core/device/common.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/datamov_utils.hpp b/modules/core/include/opencv2/core/device/datamov_utils.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/datamov_utils.hpp
rename to modules/core/include/opencv2/core/device/datamov_utils.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/detail/color_detail.hpp b/modules/core/include/opencv2/core/device/detail/color_detail.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/detail/color_detail.hpp
rename to modules/core/include/opencv2/core/device/detail/color_detail.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/detail/reduce.hpp b/modules/core/include/opencv2/core/device/detail/reduce.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/detail/reduce.hpp
rename to modules/core/include/opencv2/core/device/detail/reduce.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/detail/reduce_key_val.hpp b/modules/core/include/opencv2/core/device/detail/reduce_key_val.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/detail/reduce_key_val.hpp
rename to modules/core/include/opencv2/core/device/detail/reduce_key_val.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/detail/transform_detail.hpp b/modules/core/include/opencv2/core/device/detail/transform_detail.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/detail/transform_detail.hpp
rename to modules/core/include/opencv2/core/device/detail/transform_detail.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/detail/type_traits_detail.hpp b/modules/core/include/opencv2/core/device/detail/type_traits_detail.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/detail/type_traits_detail.hpp
rename to modules/core/include/opencv2/core/device/detail/type_traits_detail.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/detail/vec_distance_detail.hpp b/modules/core/include/opencv2/core/device/detail/vec_distance_detail.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/detail/vec_distance_detail.hpp
rename to modules/core/include/opencv2/core/device/detail/vec_distance_detail.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/dynamic_smem.hpp b/modules/core/include/opencv2/core/device/dynamic_smem.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/dynamic_smem.hpp
rename to modules/core/include/opencv2/core/device/dynamic_smem.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/emulation.hpp b/modules/core/include/opencv2/core/device/emulation.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/emulation.hpp
rename to modules/core/include/opencv2/core/device/emulation.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/filters.hpp b/modules/core/include/opencv2/core/device/filters.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/filters.hpp
rename to modules/core/include/opencv2/core/device/filters.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/funcattrib.hpp b/modules/core/include/opencv2/core/device/funcattrib.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/funcattrib.hpp
rename to modules/core/include/opencv2/core/device/funcattrib.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/functional.hpp b/modules/core/include/opencv2/core/device/functional.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/functional.hpp
rename to modules/core/include/opencv2/core/device/functional.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/limits.hpp b/modules/core/include/opencv2/core/device/limits.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/limits.hpp
rename to modules/core/include/opencv2/core/device/limits.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/reduce.hpp b/modules/core/include/opencv2/core/device/reduce.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/reduce.hpp
rename to modules/core/include/opencv2/core/device/reduce.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/saturate_cast.hpp b/modules/core/include/opencv2/core/device/saturate_cast.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/saturate_cast.hpp
rename to modules/core/include/opencv2/core/device/saturate_cast.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/scan.hpp b/modules/core/include/opencv2/core/device/scan.hpp
similarity index 98%
rename from modules/gpu/include/opencv2/gpu/device/scan.hpp
rename to modules/core/include/opencv2/core/device/scan.hpp
index 3d8da16..777754c 100644 (file)
--- a/modules/gpu/include/opencv2/gpu/device/scan.hpp
+++ b/modules/core/include/opencv2/core/device/scan.hpp
@@ -43,10 +43,10 @@
 #ifndef __OPENCV_GPU_SCAN_HPP__
 #define __OPENCV_GPU_SCAN_HPP__
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/utility.hpp"
-#include "opencv2/gpu/device/warp.hpp"
-#include "opencv2/gpu/device/warp_shuffle.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/utility.hpp"
+#include "opencv2/core/device/warp.hpp"
+#include "opencv2/core/device/warp_shuffle.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

diff --git a/modules/gpu/include/opencv2/gpu/device/simd_functions.hpp b/modules/core/include/opencv2/core/device/simd_functions.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/simd_functions.hpp
rename to modules/core/include/opencv2/core/device/simd_functions.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/static_check.hpp b/modules/core/include/opencv2/core/device/static_check.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/static_check.hpp
rename to modules/core/include/opencv2/core/device/static_check.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/transform.hpp b/modules/core/include/opencv2/core/device/transform.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/transform.hpp
rename to modules/core/include/opencv2/core/device/transform.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/type_traits.hpp b/modules/core/include/opencv2/core/device/type_traits.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/type_traits.hpp
rename to modules/core/include/opencv2/core/device/type_traits.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/utility.hpp b/modules/core/include/opencv2/core/device/utility.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/utility.hpp
rename to modules/core/include/opencv2/core/device/utility.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/vec_distance.hpp b/modules/core/include/opencv2/core/device/vec_distance.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/vec_distance.hpp
rename to modules/core/include/opencv2/core/device/vec_distance.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/vec_math.hpp b/modules/core/include/opencv2/core/device/vec_math.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/vec_math.hpp
rename to modules/core/include/opencv2/core/device/vec_math.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/vec_traits.hpp b/modules/core/include/opencv2/core/device/vec_traits.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/vec_traits.hpp
rename to modules/core/include/opencv2/core/device/vec_traits.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/warp.hpp b/modules/core/include/opencv2/core/device/warp.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/warp.hpp
rename to modules/core/include/opencv2/core/device/warp.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/warp_reduce.hpp b/modules/core/include/opencv2/core/device/warp_reduce.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/warp_reduce.hpp
rename to modules/core/include/opencv2/core/device/warp_reduce.hpp

diff --git a/modules/gpu/include/opencv2/gpu/device/warp_shuffle.hpp b/modules/core/include/opencv2/core/device/warp_shuffle.hpp
similarity index 100%
rename from modules/gpu/include/opencv2/gpu/device/warp_shuffle.hpp
rename to modules/core/include/opencv2/core/device/warp_shuffle.hpp

diff --git a/modules/core/src/cuda/matrix_operations.cu b/modules/core/src/cuda/matrix_operations.cu
index c9b12de..dd67c54 100644 (file)
--- a/modules/core/src/cuda/matrix_operations.cu
+++ b/modules/core/src/cuda/matrix_operations.cu
@@ -40,10 +40,10 @@
 //
 //M*/
 
-#include "opencv2/gpu/device/saturate_cast.hpp"
-#include "opencv2/gpu/device/transform.hpp"
-#include "opencv2/gpu/device/functional.hpp"
-#include "opencv2/gpu/device/type_traits.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
+#include "opencv2/core/device/transform.hpp"
+#include "opencv2/core/device/functional.hpp"
+#include "opencv2/core/device/type_traits.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

diff --git a/modules/gpu/CMakeLists.txt b/modules/gpu/CMakeLists.txt
index 3472b2f..b9f2e90 100644 (file)
--- a/modules/gpu/CMakeLists.txt
+++ b/modules/gpu/CMakeLists.txt
@@ -8,8 +8,6 @@ ocv_add_module(gpu opencv_imgproc opencv_calib3d opencv_objdetect opencv_video o
 ocv_module_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/cuda")
 
 file(GLOB lib_hdrs               "include/opencv2/*.hpp"                       "include/opencv2/${name}/*.hpp"               "include/opencv2/${name}/*.h")
-file(GLOB lib_device_hdrs        "include/opencv2/${name}/device/*.hpp"        "include/opencv2/${name}/device/*.h")
-file(GLOB lib_device_hdrs_detail "include/opencv2/${name}/device/detail/*.hpp" "include/opencv2/${name}/device/detail/*.h")
 file(GLOB lib_int_hdrs           "src/*.hpp"      "src/*.h")
 file(GLOB lib_cuda_hdrs          "src/cuda/*.hpp" "src/cuda/*.h")
 file(GLOB lib_srcs               "src/*.cpp")
@@ -64,7 +62,7 @@ else()
 endif()
 
 ocv_set_module_sources(
-  HEADERS ${lib_hdrs} ${lib_device_hdrs} ${lib_device_hdrs_detail}
+  HEADERS ${lib_hdrs}
   SOURCES ${lib_int_hdrs} ${lib_cuda_hdrs} ${lib_srcs} ${lib_cuda} ${ncv_files} ${cuda_objs}
   )
 

diff --git a/modules/gpu/src/cuda/NV12ToARGB.cu b/modules/gpu/src/cuda/NV12ToARGB.cu
index 99aeba6..45e44a5 100644 (file)
--- a/modules/gpu/src/cuda/NV12ToARGB.cu
+++ b/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

diff --git a/modules/gpu/src/cuda/bf_knnmatch.cu b/modules/gpu/src/cuda/bf_knnmatch.cu
index 66e37d0..2177bb2 100644 (file)
--- a/modules/gpu/src/cuda/bf_knnmatch.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/bf_match.cu b/modules/gpu/src/cuda/bf_match.cu
index f7bdcdc..c3efa74 100644 (file)
--- a/modules/gpu/src/cuda/bf_match.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/bf_radius_match.cu b/modules/gpu/src/cuda/bf_radius_match.cu
index 44cd2b5..d5ba42f 100644 (file)
--- a/modules/gpu/src/cuda/bf_radius_match.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/bgfg_gmg.cu b/modules/gpu/src/cuda/bgfg_gmg.cu
index f0f78c9..a943815 100644 (file)
--- a/modules/gpu/src/cuda/bgfg_gmg.cu
+++ b/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

diff --git a/modules/gpu/src/cuda/bgfg_mog.cu b/modules/gpu/src/cuda/bgfg_mog.cu
index 89ad5ff..57ab1f2 100644 (file)
--- a/modules/gpu/src/cuda/bgfg_mog.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/bilateral_filter.cu b/modules/gpu/src/cuda/bilateral_filter.cu
index 2a3e672..64a2a30 100644 (file)
--- a/modules/gpu/src/cuda/bilateral_filter.cu
+++ b/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;
 

diff --git a/modules/gpu/src/cuda/blend.cu b/modules/gpu/src/cuda/blend.cu
index 5cfcb51..db49e6c 100644 (file)
--- a/modules/gpu/src/cuda/blend.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/calib3d.cu b/modules/gpu/src/cuda/calib3d.cu
index 0fd482c..2c122fd 100644 (file)
--- a/modules/gpu/src/cuda/calib3d.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/canny.cu b/modules/gpu/src/cuda/canny.cu
index 1afcddc..2b7bcf7 100644 (file)
--- a/modules/gpu/src/cuda/canny.cu
+++ b/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;

diff --git a/modules/gpu/src/cuda/ccomponetns.cu b/modules/gpu/src/cuda/ccomponetns.cu
index 7f3d4ae..5519efe 100644 (file)
--- a/modules/gpu/src/cuda/ccomponetns.cu
+++ b/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>

diff --git a/modules/gpu/src/cuda/clahe.cu b/modules/gpu/src/cuda/clahe.cu
index a0c30d5..35ce9c1 100644 (file)
--- a/modules/gpu/src/cuda/clahe.cu
+++ b/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;

diff --git a/modules/gpu/src/cuda/color.cu b/modules/gpu/src/cuda/color.cu
index 8de91d1..61794e2 100644 (file)
--- a/modules/gpu/src/cuda/color.cu
+++ b/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

diff --git a/modules/gpu/src/cuda/column_filter.h b/modules/gpu/src/cuda/column_filter.h
index 46e3583..d28ceaf 100644 (file)
--- a/modules/gpu/src/cuda/column_filter.h
+++ b/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;

diff --git a/modules/gpu/src/cuda/copy_make_border.cu b/modules/gpu/src/cuda/copy_make_border.cu
index ad0d05f..3797c09 100644 (file)
--- a/modules/gpu/src/cuda/copy_make_border.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/debayer.cu b/modules/gpu/src/cuda/debayer.cu
index 1d2f18e..468c12f 100644 (file)
--- a/modules/gpu/src/cuda/debayer.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/disp_bilateral_filter.cu b/modules/gpu/src/cuda/disp_bilateral_filter.cu
index 2bf18a4..9a01b8d 100644 (file)
--- a/modules/gpu/src/cuda/disp_bilateral_filter.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/element_operations.cu b/modules/gpu/src/cuda/element_operations.cu
index e9397e5..06003e9 100644 (file)
--- a/modules/gpu/src/cuda/element_operations.cu
+++ b/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;

diff --git a/modules/gpu/src/cuda/fast.cu b/modules/gpu/src/cuda/fast.cu
index 9bf1f7a..57a7a34 100644 (file)
--- a/modules/gpu/src/cuda/fast.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/fgd_bgfg.cu b/modules/gpu/src/cuda/fgd_bgfg.cu
index 9ecf890..ebc7cf5 100644 (file)
--- a/modules/gpu/src/cuda/fgd_bgfg.cu
+++ b/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;

diff --git a/modules/gpu/src/cuda/gftt.cu b/modules/gpu/src/cuda/gftt.cu
index b5c3edb..593053d 100644 (file)
--- a/modules/gpu/src/cuda/gftt.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/global_motion.cu b/modules/gpu/src/cuda/global_motion.cu
index bad6fd5..79a19dd 100644 (file)
--- a/modules/gpu/src/cuda/global_motion.cu
+++ b/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 {
 

diff --git a/modules/gpu/src/cuda/hist.cu b/modules/gpu/src/cuda/hist.cu
index 8b8a1e8..2e67a40 100644 (file)
--- a/modules/gpu/src/cuda/hist.cu
+++ b/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;

diff --git a/modules/gpu/src/cuda/hog.cu b/modules/gpu/src/cuda/hog.cu
index 523e5bf..34cc80c 100644 (file)
--- a/modules/gpu/src/cuda/hog.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/hough.cu b/modules/gpu/src/cuda/hough.cu
index faec89b..1f885fb 100644 (file)
--- a/modules/gpu/src/cuda/hough.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/imgproc.cu b/modules/gpu/src/cuda/imgproc.cu
index dfe5e63..0f59a77 100644 (file)
--- a/modules/gpu/src/cuda/imgproc.cu
+++ b/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

diff --git a/modules/gpu/src/cuda/integral_image.cu b/modules/gpu/src/cuda/integral_image.cu
index 6b32750..9ef3166 100644 (file)
--- a/modules/gpu/src/cuda/integral_image.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/internal_shared.hpp b/modules/gpu/src/cuda/internal_shared.hpp
index a0850d0..6e84611 100644 (file)
--- a/modules/gpu/src/cuda/internal_shared.hpp
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/lbp.cu b/modules/gpu/src/cuda/lbp.cu
index 06e7303..87dfbfc 100644 (file)
--- a/modules/gpu/src/cuda/lbp.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/lbp.hpp b/modules/gpu/src/cuda/lbp.hpp
index 792a96a..9cfebd5 100644 (file)
--- a/modules/gpu/src/cuda/lbp.hpp
+++ b/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 {
 

diff --git a/modules/gpu/src/cuda/match_template.cu b/modules/gpu/src/cuda/match_template.cu
index 5f89faa..9ad3338 100644 (file)
--- a/modules/gpu/src/cuda/match_template.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/mathfunc.cu b/modules/gpu/src/cuda/mathfunc.cu
index 5571239..01ebf3d 100644 (file)
--- a/modules/gpu/src/cuda/mathfunc.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/matrix_reductions.cu b/modules/gpu/src/cuda/matrix_reductions.cu
index 745daca..d0edea5 100644 (file)
--- a/modules/gpu/src/cuda/matrix_reductions.cu
+++ b/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;

diff --git a/modules/gpu/src/cuda/nlm.cu b/modules/gpu/src/cuda/nlm.cu
index 922cba7..6fb5dba 100644 (file)
--- a/modules/gpu/src/cuda/nlm.cu
+++ b/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;
 

diff --git a/modules/gpu/src/cuda/optflowbm.cu b/modules/gpu/src/cuda/optflowbm.cu
index 774b68d..7cc4d2f 100644 (file)
--- a/modules/gpu/src/cuda/optflowbm.cu
+++ b/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;

diff --git a/modules/gpu/src/cuda/optical_flow.cu b/modules/gpu/src/cuda/optical_flow.cu
index d2c68a7..a80d485 100644 (file)
--- a/modules/gpu/src/cuda/optical_flow.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/optical_flow_farneback.cu b/modules/gpu/src/cuda/optical_flow_farneback.cu
index 9236962..f9f50c8 100644 (file)
--- a/modules/gpu/src/cuda/optical_flow_farneback.cu
+++ b/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

diff --git a/modules/gpu/src/cuda/orb.cu b/modules/gpu/src/cuda/orb.cu
index 723bf28..9c4e0ff 100644 (file)
--- a/modules/gpu/src/cuda/orb.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/pyr_down.cu b/modules/gpu/src/cuda/pyr_down.cu
index e6ef647..4244250 100644 (file)
--- a/modules/gpu/src/cuda/pyr_down.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/pyr_up.cu b/modules/gpu/src/cuda/pyr_up.cu
index a36c2b9..52ef35a 100644 (file)
--- a/modules/gpu/src/cuda/pyr_up.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/pyrlk.cu b/modules/gpu/src/cuda/pyrlk.cu
index 8ef728b..fc387a7 100644 (file)
--- a/modules/gpu/src/cuda/pyrlk.cu
+++ b/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;

diff --git a/modules/gpu/src/cuda/remap.cu b/modules/gpu/src/cuda/remap.cu
index 40ecf66..4589834 100644 (file)
--- a/modules/gpu/src/cuda/remap.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/resize.cu b/modules/gpu/src/cuda/resize.cu
index e78bcc0..86f8d55 100644 (file)
--- a/modules/gpu/src/cuda/resize.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/rgb_to_yv12.cu b/modules/gpu/src/cuda/rgb_to_yv12.cu
index e38368a..56800fc 100644 (file)
--- a/modules/gpu/src/cuda/rgb_to_yv12.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/row_filter.h b/modules/gpu/src/cuda/row_filter.h
index 933f900..beaee37 100644 (file)
--- a/modules/gpu/src/cuda/row_filter.h
+++ b/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;

diff --git a/modules/gpu/src/cuda/split_merge.cu b/modules/gpu/src/cuda/split_merge.cu
index dad787d..d92ecbc 100644 (file)
--- a/modules/gpu/src/cuda/split_merge.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/stereobm.cu b/modules/gpu/src/cuda/stereobm.cu
index cfe8e76..10a63ec 100644 (file)
--- a/modules/gpu/src/cuda/stereobm.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/stereobp.cu b/modules/gpu/src/cuda/stereobp.cu
index f696b62..2aa70bf 100644 (file)
--- a/modules/gpu/src/cuda/stereobp.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/stereocsbp.cu b/modules/gpu/src/cuda/stereocsbp.cu
index 7b76f47..717398e 100644 (file)
--- a/modules/gpu/src/cuda/stereocsbp.cu
+++ b/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
 {

diff --git a/modules/gpu/src/cuda/tvl1flow.cu b/modules/gpu/src/cuda/tvl1flow.cu
index a2b934b..29470fb 100644 (file)
--- a/modules/gpu/src/cuda/tvl1flow.cu
+++ b/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;

diff --git a/modules/gpu/src/cuda/warp.cu b/modules/gpu/src/cuda/warp.cu
index 2f03170..4a00644 100644 (file)
--- a/modules/gpu/src/cuda/warp.cu
+++ b/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
 {

diff --git a/modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu b/modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu
index c4a270a..881d126 100644 (file)
--- a/modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu
+++ b/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;

diff --git a/modules/gpu/src/nvidia/NCVHaarObjectDetection.cu b/modules/gpu/src/nvidia/NCVHaarObjectDetection.cu
index c137b2a..4ff632b 100644 (file)
--- a/modules/gpu/src/nvidia/NCVHaarObjectDetection.cu
+++ b/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"
 
 
 //==============================================================================

diff --git a/modules/gpu/src/nvidia/NPP_staging/NPP_staging.cu b/modules/gpu/src/nvidia/NPP_staging/NPP_staging.cu
index 525feb6..8d89817 100644 (file)
--- a/modules/gpu/src/nvidia/NPP_staging/NPP_staging.cu
+++ b/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;

diff --git a/modules/gpu/src/nvidia/core/NCVPyramid.cu b/modules/gpu/src/nvidia/core/NCVPyramid.cu
index 3cb3a33..89d1d4b 100644 (file)
--- a/modules/gpu/src/nvidia/core/NCVPyramid.cu
+++ b/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);};
 

diff --git a/modules/nonfree/src/cuda/surf.cu b/modules/nonfree/src/cuda/surf.cu
index 4cd8182..39de3c3 100644 (file)
--- a/modules/nonfree/src/cuda/surf.cu
+++ b/modules/nonfree/src/cuda/surf.cu
@@ -44,13 +44,13 @@
 
 #ifdef HAVE_OPENCV_GPU
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/limits.hpp"
-#include "opencv2/gpu/device/saturate_cast.hpp"
-#include "opencv2/gpu/device/reduce.hpp"
-#include "opencv2/gpu/device/utility.hpp"
-#include "opencv2/gpu/device/functional.hpp"
-#include "opencv2/gpu/device/filters.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/limits.hpp"
+#include "opencv2/core/device/saturate_cast.hpp"
+#include "opencv2/core/device/reduce.hpp"
+#include "opencv2/core/device/utility.hpp"
+#include "opencv2/core/device/functional.hpp"
+#include "opencv2/core/device/filters.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

diff --git a/modules/nonfree/src/cuda/vibe.cu b/modules/nonfree/src/cuda/vibe.cu
index 7276e7a..52cbed7 100644 (file)
--- a/modules/nonfree/src/cuda/vibe.cu
+++ b/modules/nonfree/src/cuda/vibe.cu
@@ -44,7 +44,7 @@
 
 #ifdef HAVE_OPENCV_GPU
 
-#include "opencv2/gpu/device/common.hpp"
+#include "opencv2/core/device/common.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

diff --git a/modules/nonfree/src/precomp.hpp b/modules/nonfree/src/precomp.hpp
index 1cbb36d..51d2aba 100644 (file)
--- a/modules/nonfree/src/precomp.hpp
+++ b/modules/nonfree/src/precomp.hpp
@@ -56,7 +56,7 @@
 
     #if defined(HAVE_CUDA)
         #include "opencv2/core/stream_accessor.hpp"
-        #include "opencv2/gpu/device/common.hpp"
+        #include "opencv2/core/device/common.hpp"
 
         static inline void throw_nogpu() { CV_Error(CV_StsNotImplemented, "The called functionality is disabled for current build or platform"); }
     #else

diff --git a/modules/softcascade/src/cuda_invoker.hpp b/modules/softcascade/src/cuda_invoker.hpp
index 9589b6f..135f405 100644 (file)
--- a/modules/softcascade/src/cuda_invoker.hpp
+++ b/modules/softcascade/src/cuda_invoker.hpp
@@ -44,7 +44,6 @@
 #ifndef __OPENCV_ICF_HPP__
 #define __OPENCV_ICF_HPP__
 
-// #include <opencv2/gpu/device/common.hpp>
 #include "opencv2/core/cuda_devptrs.hpp"
 #include "cuda_runtime_api.h"
 
@@ -154,4 +153,4 @@ struct CascadeInvoker
 
 }}}
 
-#endif
\ No newline at end of file
+#endif

diff --git a/modules/superres/CMakeLists.txt b/modules/superres/CMakeLists.txt
index 92ce01c..6c6022c 100644 (file)
--- a/modules/superres/CMakeLists.txt
+++ b/modules/superres/CMakeLists.txt
@@ -3,29 +3,5 @@ if(ANDROID OR IOS)
 endif()
 
 set(the_description "Super Resolution")
-ocv_add_module(superres opencv_imgproc opencv_video OPTIONAL opencv_gpu opencv_highgui)
-ocv_module_include_directories()
-
-ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef /wd4127)
-
-if(HAVE_CUDA)
-  ocv_source_group("Src\\Cuda" GLOB "src/cuda/*.cu")
-  ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/include" ${CUDA_INCLUDE_DIRS})
-
-  file(GLOB lib_cuda "src/cuda/*.cu")
-  ocv_cuda_compile(cuda_objs ${lib_cuda})
-
-  set(cuda_link_libs ${CUDA_LIBRARIES})
-else()
-  set(lib_cuda "")
-  set(cuda_objs "")
-  set(cuda_link_libs "")
-endif()
-
-ocv_glob_module_sources(SOURCES ${lib_cuda} ${cuda_objs})
-
-ocv_create_module(${cuda_link_libs})
-ocv_add_precompiled_headers(${the_module})
-
-ocv_add_accuracy_tests()
-ocv_add_perf_tests()
+ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 -Wundef)
+ocv_define_module(superres opencv_imgproc opencv_video OPTIONAL opencv_gpu opencv_highgui)

diff --git a/modules/superres/src/cuda/btv_l1_gpu.cu b/modules/superres/src/cuda/btv_l1_gpu.cu
index b27671a..2bb93d1 100644 (file)
--- a/modules/superres/src/cuda/btv_l1_gpu.cu
+++ b/modules/superres/src/cuda/btv_l1_gpu.cu
@@ -40,10 +40,10 @@
 //
 //M*/
 
-#include "opencv2/gpu/device/common.hpp"
-#include "opencv2/gpu/device/transform.hpp"
-#include "opencv2/gpu/device/vec_traits.hpp"
-#include "opencv2/gpu/device/vec_math.hpp"
+#include "opencv2/core/device/common.hpp"
+#include "opencv2/core/device/transform.hpp"
+#include "opencv2/core/device/vec_traits.hpp"
+#include "opencv2/core/device/vec_math.hpp"
 
 using namespace cv::gpu;
 using namespace cv::gpu::device;