From 4c9773d55f7b5baac56030c3df9ab22630a8d1b8 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Thu, 30 May 2013 11:23:18 +0400 Subject: [PATCH] renamed gpu headers (made it more consistent) --- modules/core/include/opencv2/core/cuda/common.hpp | 2 +- .../include/opencv2/core/{gpumat.hpp => gpu.hpp} | 12 ++++++++---- modules/core/include/opencv2/core/gpu_private.hpp | 4 +++- ...stream_accessor.hpp => gpu_stream_accessor.hpp} | 14 +++++++++----- .../core/{cuda_devptrs.hpp => gpu_types.hpp} | 14 +++++++------- modules/core/src/{gpumat.cpp => gpu.cpp} | 0 .../{matrix_operations.cpp => gpu_cuda_mem.cpp} | 0 .../core/src/{cudastream.cpp => gpu_stream.cpp} | 0 modules/core/src/matrix.cpp | 2 +- modules/core/src/precomp.hpp | 2 +- modules/gpu/include/opencv2/gpu.hpp | 2 +- modules/gpuarithm/include/opencv2/gpuarithm.hpp | 2 +- modules/gpubgsegm/include/opencv2/gpubgsegm.hpp | 2 +- modules/gpubgsegm/src/cuda/fgd.hpp | 2 +- modules/gpucodec/include/opencv2/gpucodec.hpp | 2 +- .../include/opencv2/gpufeatures2d.hpp | 2 +- modules/gpufilters/include/opencv2/gpufilters.hpp | 2 +- modules/gpuimgproc/include/opencv2/gpuimgproc.hpp | 2 +- modules/gpulegacy/test/test_precomp.hpp | 2 +- modules/gpuoptflow/include/opencv2/gpuoptflow.hpp | 2 +- modules/gpustereo/include/opencv2/gpustereo.hpp | 2 +- modules/gpuwarping/include/opencv2/gpuwarping.hpp | 2 +- modules/nonfree/include/opencv2/nonfree/gpu.hpp | 2 +- modules/photo/include/opencv2/photo/gpu.hpp | 2 +- .../softcascade/include/opencv2/softcascade.hpp | 7 ++++--- modules/softcascade/src/cuda/channels.cu | 2 +- modules/softcascade/src/cuda_invoker.hpp | 2 +- modules/softcascade/test/test_cuda_softcascade.cpp | 2 +- modules/softcascade/test/utility.hpp | 2 +- .../include/opencv2/stitching/detail/warpers.hpp | 2 +- modules/superres/perf/perf_precomp.hpp | 2 +- modules/superres/src/input_array_utility.hpp | 2 +- modules/superres/src/precomp.hpp | 2 +- modules/ts/include/opencv2/ts/gpu_test.hpp | 2 +- modules/ts/src/gpu_perf.cpp | 2 +- modules/ts/src/ts_perf.cpp | 6 +----- .../opencv2/videostab/wobble_suppression.hpp | 2 +- samples/gpu/opengl.cpp | 2 +- 38 files changed, 61 insertions(+), 54 deletions(-) rename modules/core/include/opencv2/core/{gpumat.hpp => gpu.hpp} (98%) rename modules/core/include/opencv2/core/{stream_accessor.hpp => gpu_stream_accessor.hpp} (91%) rename modules/core/include/opencv2/core/{cuda_devptrs.hpp => gpu_types.hpp} (94%) rename modules/core/src/{gpumat.cpp => gpu.cpp} (100%) rename modules/core/src/{matrix_operations.cpp => gpu_cuda_mem.cpp} (100%) rename modules/core/src/{cudastream.cpp => gpu_stream.cpp} (100%) diff --git a/modules/core/include/opencv2/core/cuda/common.hpp b/modules/core/include/opencv2/core/cuda/common.hpp index 434a3eba1d..6b3fef19a4 100644 --- a/modules/core/include/opencv2/core/cuda/common.hpp +++ b/modules/core/include/opencv2/core/cuda/common.hpp @@ -44,7 +44,7 @@ #define __OPENCV_GPU_COMMON_HPP__ #include -#include "opencv2/core/cuda_devptrs.hpp" +#include "opencv2/core/gpu_types.hpp" #include "opencv2/core/cvdef.h" #include "opencv2/core/base.hpp" diff --git a/modules/core/include/opencv2/core/gpumat.hpp b/modules/core/include/opencv2/core/gpu.hpp similarity index 98% rename from modules/core/include/opencv2/core/gpumat.hpp rename to modules/core/include/opencv2/core/gpu.hpp index 52b87b0002..9ce2b1faf1 100644 --- a/modules/core/include/opencv2/core/gpumat.hpp +++ b/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__ */ diff --git a/modules/core/include/opencv2/core/gpu_private.hpp b/modules/core/include/opencv2/core/gpu_private.hpp index 7a45a50f07..cacc194b93 100644 --- a/modules/core/include/opencv2/core/gpu_private.hpp +++ b/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 # include # include -# 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) diff --git a/modules/core/include/opencv2/core/stream_accessor.hpp b/modules/core/include/opencv2/core/gpu_stream_accessor.hpp similarity index 91% rename from modules/core/include/opencv2/core/stream_accessor.hpp rename to modules/core/include/opencv2/core/gpu_stream_accessor.hpp index 3f98eb0a35..364ab279ab 100644 --- a/modules/core/include/opencv2/core/stream_accessor.hpp +++ b/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 -#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 +#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__ */ diff --git a/modules/core/include/opencv2/core/cuda_devptrs.hpp b/modules/core/include/opencv2/core/gpu_types.hpp similarity index 94% rename from modules/core/include/opencv2/core/cuda_devptrs.hpp rename to modules/core/include/opencv2/core/gpu_types.hpp index c82ce61b31..1370c6f620 100644 --- a/modules/core/include/opencv2/core/cuda_devptrs.hpp +++ b/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(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::data + y * step); } @@ -148,6 +150,4 @@ namespace cv } } -#endif // __cplusplus - -#endif /* __OPENCV_CORE_DEVPTRS_HPP__ */ +#endif /* __OPENCV_CORE_GPU_TYPES_HPP__ */ diff --git a/modules/core/src/gpumat.cpp b/modules/core/src/gpu.cpp similarity index 100% rename from modules/core/src/gpumat.cpp rename to modules/core/src/gpu.cpp diff --git a/modules/core/src/matrix_operations.cpp b/modules/core/src/gpu_cuda_mem.cpp similarity index 100% rename from modules/core/src/matrix_operations.cpp rename to modules/core/src/gpu_cuda_mem.cpp diff --git a/modules/core/src/cudastream.cpp b/modules/core/src/gpu_stream.cpp similarity index 100% rename from modules/core/src/cudastream.cpp rename to modules/core/src/gpu_stream.cpp diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp index 948c8d7705..393798c95c 100644 --- a/modules/core/src/matrix.cpp +++ b/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" /****************************************************************************************\ diff --git a/modules/core/src/precomp.hpp b/modules/core/src/precomp.hpp index 8b39d7a157..f86f466f22 100644 --- a/modules/core/src/precomp.hpp +++ b/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" diff --git a/modules/gpu/include/opencv2/gpu.hpp b/modules/gpu/include/opencv2/gpu.hpp index 5dc9b9549e..1b0120ba25 100644 --- a/modules/gpu/include/opencv2/gpu.hpp +++ b/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" diff --git a/modules/gpuarithm/include/opencv2/gpuarithm.hpp b/modules/gpuarithm/include/opencv2/gpuarithm.hpp index 55d163da42..4edc29ba4d 100644 --- a/modules/gpuarithm/include/opencv2/gpuarithm.hpp +++ b/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 { diff --git a/modules/gpubgsegm/include/opencv2/gpubgsegm.hpp b/modules/gpubgsegm/include/opencv2/gpubgsegm.hpp index fbb53f7886..e7a29b5763 100644 --- a/modules/gpubgsegm/include/opencv2/gpubgsegm.hpp +++ b/modules/gpubgsegm/include/opencv2/gpubgsegm.hpp @@ -49,7 +49,7 @@ #include -#include "opencv2/core/gpumat.hpp" +#include "opencv2/core/gpu.hpp" #include "opencv2/gpufilters.hpp" namespace cv { namespace gpu { diff --git a/modules/gpubgsegm/src/cuda/fgd.hpp b/modules/gpubgsegm/src/cuda/fgd.hpp index a8fda7bb68..dd71519605 100644 --- a/modules/gpubgsegm/src/cuda/fgd.hpp +++ b/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 { diff --git a/modules/gpucodec/include/opencv2/gpucodec.hpp b/modules/gpucodec/include/opencv2/gpucodec.hpp index ac9c400474..af68c38410 100644 --- a/modules/gpucodec/include/opencv2/gpucodec.hpp +++ b/modules/gpucodec/include/opencv2/gpucodec.hpp @@ -49,7 +49,7 @@ #include -#include "opencv2/core/gpumat.hpp" +#include "opencv2/core/gpu.hpp" namespace cv { namespace gpu { diff --git a/modules/gpufeatures2d/include/opencv2/gpufeatures2d.hpp b/modules/gpufeatures2d/include/opencv2/gpufeatures2d.hpp index 08313b1fc2..0c821745f9 100644 --- a/modules/gpufeatures2d/include/opencv2/gpufeatures2d.hpp +++ b/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 { diff --git a/modules/gpufilters/include/opencv2/gpufilters.hpp b/modules/gpufilters/include/opencv2/gpufilters.hpp index 853755de4d..582c55d999 100644 --- a/modules/gpufilters/include/opencv2/gpufilters.hpp +++ b/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 { diff --git a/modules/gpuimgproc/include/opencv2/gpuimgproc.hpp b/modules/gpuimgproc/include/opencv2/gpuimgproc.hpp index 809fdb91b5..cf1b8e6706 100644 --- a/modules/gpuimgproc/include/opencv2/gpuimgproc.hpp +++ b/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" diff --git a/modules/gpulegacy/test/test_precomp.hpp b/modules/gpulegacy/test/test_precomp.hpp index 0de044acb5..90fc4d2fae 100644 --- a/modules/gpulegacy/test/test_precomp.hpp +++ b/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" diff --git a/modules/gpuoptflow/include/opencv2/gpuoptflow.hpp b/modules/gpuoptflow/include/opencv2/gpuoptflow.hpp index f47a55ea1b..e9e0719879 100644 --- a/modules/gpuoptflow/include/opencv2/gpuoptflow.hpp +++ b/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 { diff --git a/modules/gpustereo/include/opencv2/gpustereo.hpp b/modules/gpustereo/include/opencv2/gpustereo.hpp index 54ce82d087..ecda512068 100644 --- a/modules/gpustereo/include/opencv2/gpustereo.hpp +++ b/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 { diff --git a/modules/gpuwarping/include/opencv2/gpuwarping.hpp b/modules/gpuwarping/include/opencv2/gpuwarping.hpp index ada180d9f9..18b42ce605 100644 --- a/modules/gpuwarping/include/opencv2/gpuwarping.hpp +++ b/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 { diff --git a/modules/nonfree/include/opencv2/nonfree/gpu.hpp b/modules/nonfree/include/opencv2/nonfree/gpu.hpp index fc91b26bbe..b94a99cf72 100644 --- a/modules/nonfree/include/opencv2/nonfree/gpu.hpp +++ b/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 { diff --git a/modules/photo/include/opencv2/photo/gpu.hpp b/modules/photo/include/opencv2/photo/gpu.hpp index 8a018b5675..a8b3859e75 100644 --- a/modules/photo/include/opencv2/photo/gpu.hpp +++ b/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 { diff --git a/modules/softcascade/include/opencv2/softcascade.hpp b/modules/softcascade/include/opencv2/softcascade.hpp index a174c5098b..60f33aa052 100644 --- a/modules/softcascade/include/opencv2/softcascade.hpp +++ b/modules/softcascade/include/opencv2/softcascade.hpp @@ -43,9 +43,10 @@ #ifndef __OPENCV_SOFTCASCADE_HPP__ #define __OPENCV_SOFTCASCADE_HPP__ +#include + #include "opencv2/core.hpp" -#include "opencv2/core/gpumat.hpp" -#include +#include "opencv2/core/gpu.hpp" namespace cv { namespace softcascade { @@ -296,4 +297,4 @@ private: }} // namespace cv { namespace softcascade { -#endif \ No newline at end of file +#endif diff --git a/modules/softcascade/src/cuda/channels.cu b/modules/softcascade/src/cuda/channels.cu index ca90113406..78489e1f8b 100644 --- a/modules/softcascade/src/cuda/channels.cu +++ b/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 diff --git a/modules/softcascade/src/cuda_invoker.hpp b/modules/softcascade/src/cuda_invoker.hpp index 85bf63c9d2..92f30d01d2 100644 --- a/modules/softcascade/src/cuda_invoker.hpp +++ b/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__ diff --git a/modules/softcascade/test/test_cuda_softcascade.cpp b/modules/softcascade/test/test_cuda_softcascade.cpp index 7787664e40..4d97f92082 100644 --- a/modules/softcascade/test/test_cuda_softcascade.cpp +++ b/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 diff --git a/modules/softcascade/test/utility.hpp b/modules/softcascade/test/utility.hpp index 9849b525e2..44b0fabf29 100644 --- a/modules/softcascade/test/utility.hpp +++ b/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" ////////////////////////////////////////////////////////////////////// diff --git a/modules/stitching/include/opencv2/stitching/detail/warpers.hpp b/modules/stitching/include/opencv2/stitching/detail/warpers.hpp index 55b4d3a8f3..5cd8f5141c 100644 --- a/modules/stitching/include/opencv2/stitching/detail/warpers.hpp +++ b/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" diff --git a/modules/superres/perf/perf_precomp.hpp b/modules/superres/perf/perf_precomp.hpp index f92d8e480d..72236c4ba0 100644 --- a/modules/superres/perf/perf_precomp.hpp +++ b/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" diff --git a/modules/superres/src/input_array_utility.hpp b/modules/superres/src/input_array_utility.hpp index c8141234df..488399fc0c 100644 --- a/modules/superres/src/input_array_utility.hpp +++ b/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 { diff --git a/modules/superres/src/precomp.hpp b/modules/superres/src/precomp.hpp index 73074c420e..300894ecfe 100644 --- a/modules/superres/src/precomp.hpp +++ b/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" diff --git a/modules/ts/include/opencv2/ts/gpu_test.hpp b/modules/ts/include/opencv2/ts/gpu_test.hpp index b4c6e7b741..dab5fd3b99 100644 --- a/modules/ts/include/opencv2/ts/gpu_test.hpp +++ b/modules/ts/include/opencv2/ts/gpu_test.hpp @@ -45,7 +45,7 @@ #include #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" diff --git a/modules/ts/src/gpu_perf.cpp b/modules/ts/src/gpu_perf.cpp index 19146c0b58..f6d3bb3ce9 100644 --- a/modules/ts/src/gpu_perf.cpp +++ b/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 diff --git a/modules/ts/src/ts_perf.cpp b/modules/ts/src/ts_perf.cpp index 33a9ec7e3c..caaeda4c70 100644 --- a/modules/ts/src/ts_perf.cpp +++ b/modules/ts/src/ts_perf.cpp @@ -1,7 +1,7 @@ #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 -#endif - namespace { class PerfEnvironment: public ::testing::Environment diff --git a/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp b/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp index 987a19b1b0..8588acbc58 100644 --- a/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp +++ b/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp @@ -45,7 +45,7 @@ #include #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" diff --git a/samples/gpu/opengl.cpp b/samples/gpu/opengl.cpp index 80eb44b539..37960d9a9f 100644 --- a/samples/gpu/opengl.cpp +++ b/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;