renamed gpu headers (made it more consistent)

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

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

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

@@ -42,11 +42,15 @@
 //M*/
 
 
-#ifndef __OPENCV_GPUMAT_HPP__
-#define __OPENCV_GPUMAT_HPP__
+#ifndef __OPENCV_CORE_GPU_HPP__
+#define __OPENCV_CORE_GPU_HPP__
+
+#ifndef __cplusplus
+#  error gpu.hpp header must be compiled as C++
+#endif
 
 #include "opencv2/core.hpp"
-#include "opencv2/core/cuda_devptrs.hpp"
+#include "opencv2/core/gpu_types.hpp"
 
 namespace cv { namespace gpu
 {
@@ -719,4 +723,4 @@ void ensureSizeIsEnough(Size size, int type, GpuMat& m)
 
 }} // cv::gpu
 
-#endif // __OPENCV_GPUMAT_HPP__
+#endif /* __OPENCV_CORE_GPU_HPP__ */

modules/core/include/opencv2/core/gpu_private.hpp

@@ -53,11 +53,13 @@
 #include "opencv2/core/cvdef.h"
 #include "opencv2/core/base.hpp"
 
+#include "opencv2/core/gpu.hpp"
+
 #ifdef HAVE_CUDA
 #  include <cuda.h>
 #  include <cuda_runtime.h>
 #  include <npp.h>
-#  include "opencv2/core/stream_accessor.hpp"
+#  include "opencv2/core/gpu_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/include/opencv2/core/stream_accessor.hpp → modules/core/include/opencv2/core/gpu_stream_accessor.hpp

@@ -40,17 +40,21 @@
 //
 //M*/
 
-#ifndef __OPENCV_CUDA_STREAM_ACCESSOR_HPP__
-#define __OPENCV_CUDA_STREAM_ACCESSOR_HPP__
+#ifndef __OPENCV_CORE_GPU_STREAM_ACCESSOR_HPP__
+#define __OPENCV_CORE_GPU_STREAM_ACCESSOR_HPP__
 
-#include <cuda_runtime.h>
-#include "opencv2/core/cvdef.h"
+#ifndef __cplusplus
+#  error gpu_stream_accessor.hpp header must be compiled as C++
+#endif
 
 // This is only header file that depends on Cuda. All other headers are independent.
 // So if you use OpenCV binaries you do noot need to install Cuda Toolkit.
 // But of you wanna use GPU by yourself, may get cuda stream instance using the class below.
 // In this case you have to install Cuda Toolkit.
 
+#include <cuda_runtime.h>
+#include "opencv2/core/cvdef.h"
+
 namespace cv
 {
     namespace gpu
@@ -64,4 +68,4 @@ namespace cv
     }
 }
 
-#endif /* __OPENCV_CUDA_STREAM_ACCESSOR_HPP__ */
+#endif /* __OPENCV_CORE_GPU_STREAM_ACCESSOR_HPP__ */

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

@@ -40,10 +40,12 @@
 //
 //M*/
 
-#ifndef __OPENCV_CORE_DEVPTRS_HPP__
-#define __OPENCV_CORE_DEVPTRS_HPP__
+#ifndef __OPENCV_CORE_GPU_TYPES_HPP__
+#define __OPENCV_CORE_GPU_TYPES_HPP__
 
-#ifdef __cplusplus
+#ifndef __cplusplus
+#  error gpu_types.hpp header must be compiled as C++
+#endif
 
 #ifdef __CUDACC__
     #define __CV_GPU_HOST_DEVICE__ __host__ __device__ __forceinline__
@@ -88,7 +90,7 @@ namespace cv
             __CV_GPU_HOST_DEVICE__ PtrStep() : step(0) {}
             __CV_GPU_HOST_DEVICE__ PtrStep(T* data_, size_t step_) : DevPtr<T>(data_), step(step_) {}
 
-            /** \brief stride between two consecutive rows in bytes. Step is stored always and everywhere in bytes!!! */
+            //! stride between two consecutive rows in bytes. Step is stored always and everywhere in bytes!!!
             size_t step;
 
             __CV_GPU_HOST_DEVICE__       T* ptr(int y = 0)       { return (      T*)( (      char*)DevPtr<T>::data + y * step); }
@@ -148,6 +150,4 @@ namespace cv
     }
 }
 
-#endif // __cplusplus
-
-#endif /* __OPENCV_CORE_DEVPTRS_HPP__ */
+#endif /* __OPENCV_CORE_GPU_TYPES_HPP__ */

modules/core/src/matrix.cpp

@@ -41,7 +41,7 @@
 //M*/
 
 #include "precomp.hpp"
-#include "opencv2/core/gpumat.hpp"
+#include "opencv2/core/gpu.hpp"
 #include "opencv2/core/opengl.hpp"
 
 /****************************************************************************************\

modules/core/src/precomp.hpp

@@ -45,7 +45,7 @@
 
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/core_c.h"
-#include "opencv2/core/gpumat.hpp"
+#include "opencv2/core/gpu.hpp"
 #include "opencv2/core/opengl.hpp"
 
 #include "opencv2/core/private.hpp"

modules/gpu/include/opencv2/gpu.hpp

@@ -47,7 +47,7 @@
 #  error gpu.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpumat.hpp"
+#include "opencv2/core/gpu.hpp"
 
 #if !defined(__OPENCV_BUILD) && !defined(OPENCV_GPU_SKIP_INCLUDE)
     #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/gpumat.hpp"
+#include "opencv2/core/gpu.hpp"
 
 namespace cv { namespace gpu {
 

modules/gpubgsegm/include/opencv2/gpubgsegm.hpp

@@ -49,7 +49,7 @@
 
 #include <memory>
 
-#include "opencv2/core/gpumat.hpp"
+#include "opencv2/core/gpu.hpp"
 #include "opencv2/gpufilters.hpp"
 
 namespace cv { namespace gpu {

modules/gpubgsegm/src/cuda/fgd.hpp

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

modules/gpucodec/include/opencv2/gpucodec.hpp

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

modules/gpufeatures2d/include/opencv2/gpufeatures2d.hpp

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

modules/gpufilters/include/opencv2/gpufilters.hpp

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

modules/gpuimgproc/include/opencv2/gpuimgproc.hpp

@@ -47,7 +47,7 @@
 #  error gpuimgproc.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpumat.hpp"
+#include "opencv2/core/gpu.hpp"
 #include "opencv2/core/base.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/gpufilters.hpp"

modules/gpulegacy/test/test_precomp.hpp

@@ -68,7 +68,7 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_test.hpp"
 
-#include "opencv2/core/gpumat.hpp"
+#include "opencv2/core/gpu.hpp"
 #include "opencv2/gpulegacy.hpp"
 #include "opencv2/highgui.hpp"
 

modules/gpuoptflow/include/opencv2/gpuoptflow.hpp

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

modules/gpustereo/include/opencv2/gpustereo.hpp

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

modules/gpuwarping/include/opencv2/gpuwarping.hpp

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

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

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

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

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

modules/softcascade/include/opencv2/softcascade.hpp

@@ -43,9 +43,10 @@
 #ifndef __OPENCV_SOFTCASCADE_HPP__
 #define __OPENCV_SOFTCASCADE_HPP__
 
+#include <iosfwd>
+
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpumat.hpp"
-#include <ostream>
+#include "opencv2/core/gpu.hpp"
 
 namespace cv { namespace softcascade {
 

modules/softcascade/src/cuda/channels.cu

@@ -40,7 +40,7 @@
 //
 //M*/
 
-#include "opencv2/core/cuda_devptrs.hpp"
+#include "opencv2/core/gpu_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/cuda_devptrs.hpp"
+#include "opencv2/core/gpu_types.hpp"
 #include "cuda_runtime_api.h"
 
 #if defined __CUDACC__

modules/softcascade/test/test_cuda_softcascade.cpp

@@ -41,7 +41,7 @@
 //M*/
 
 #include "test_precomp.hpp"
-#include "opencv2/core/gpumat.hpp"
+#include "opencv2/core/gpu.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/gpumat.hpp"
+#include "opencv2/core/gpu.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/gpumat.hpp"
+#include "opencv2/core/gpu.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/gpumat.hpp"
+#include "opencv2/core/gpu.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/gpumat.hpp"
+#include "opencv2/core/gpu.hpp"
 
 namespace cv
 {

modules/superres/src/precomp.hpp

@@ -48,7 +48,7 @@
 
 #include "opencv2/opencv_modules.hpp"
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpumat.hpp"
+#include "opencv2/core/gpu.hpp"
 #include "opencv2/core/opengl.hpp"
 #include "opencv2/core/utility.hpp"
 #include "opencv2/imgproc.hpp"

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

@@ -45,7 +45,7 @@
 
 #include <stdexcept>
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpumat.hpp"
+#include "opencv2/core/gpu.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/gpumat.hpp"
+#include "opencv2/core/gpu.hpp"
 
 #ifdef HAVE_CUDA
     #include <cuda_runtime.h>

modules/ts/src/ts_perf.cpp

 #include "precomp.hpp"
 
 #ifdef HAVE_CUDA
-#include "opencv2/core/gpumat.hpp"
+#include "opencv2/core/gpu.hpp"
 #endif
 
 #ifdef ANDROID
@@ -72,10 +72,6 @@ static void setCurrentThreadAffinityMask(int mask)
 }
 #endif
 
-#ifdef HAVE_CUDA
-# include <opencv2/core/gpumat.hpp>
-#endif
-
 namespace {
 
 class PerfEnvironment: public ::testing::Environment

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

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

samples/gpu/opengl.cpp

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