renamed gpu* source to cuda* in core module
This commit is contained in:
@@ -45,11 +45,11 @@
|
||||
#define __OPENCV_CORE_GPU_HPP__
|
||||
|
||||
#ifndef __cplusplus
|
||||
# error gpu.hpp header must be compiled as C++
|
||||
# error cuda.hpp header must be compiled as C++
|
||||
#endif
|
||||
|
||||
#include "opencv2/core.hpp"
|
||||
#include "opencv2/core/gpu_types.hpp"
|
||||
#include "opencv2/core/cuda_types.hpp"
|
||||
|
||||
namespace cv { namespace cuda {
|
||||
|
||||
@@ -673,6 +673,6 @@ template <> CV_EXPORTS void Ptr<cv::cuda::Event::Impl>::delete_obj();
|
||||
|
||||
}
|
||||
|
||||
#include "opencv2/core/gpu.inl.hpp"
|
||||
#include "opencv2/core/cuda.inl.hpp"
|
||||
|
||||
#endif /* __OPENCV_CORE_GPU_HPP__ */
|
@@ -44,7 +44,7 @@
|
||||
#ifndef __OPENCV_CORE_GPUINL_HPP__
|
||||
#define __OPENCV_CORE_GPUINL_HPP__
|
||||
|
||||
#include "opencv2/core/gpu.hpp"
|
||||
#include "opencv2/core/cuda.hpp"
|
||||
|
||||
namespace cv { namespace cuda {
|
||||
|
@@ -44,7 +44,7 @@
|
||||
#define __OPENCV_GPU_COMMON_HPP__
|
||||
|
||||
#include <cuda_runtime.h>
|
||||
#include "opencv2/core/gpu_types.hpp"
|
||||
#include "opencv2/core/cuda_types.hpp"
|
||||
#include "opencv2/core/cvdef.h"
|
||||
#include "opencv2/core/base.hpp"
|
||||
|
||||
|
@@ -44,7 +44,7 @@
|
||||
#define __OPENCV_CORE_GPU_STREAM_ACCESSOR_HPP__
|
||||
|
||||
#ifndef __cplusplus
|
||||
# error gpu_stream_accessor.hpp header must be compiled as C++
|
||||
# error cuda_stream_accessor.hpp header must be compiled as C++
|
||||
#endif
|
||||
|
||||
// This is only header file that depends on Cuda. All other headers are independent.
|
@@ -44,7 +44,7 @@
|
||||
#define __OPENCV_CORE_GPU_TYPES_HPP__
|
||||
|
||||
#ifndef __cplusplus
|
||||
# error gpu_types.hpp header must be compiled as C++
|
||||
# error cuda_types.hpp header must be compiled as C++
|
||||
#endif
|
||||
|
||||
#ifdef __CUDACC__
|
@@ -53,13 +53,13 @@
|
||||
#include "opencv2/core/cvdef.h"
|
||||
#include "opencv2/core/base.hpp"
|
||||
|
||||
#include "opencv2/core/gpu.hpp"
|
||||
#include "opencv2/core/cuda.hpp"
|
||||
|
||||
#ifdef HAVE_CUDA
|
||||
# include <cuda.h>
|
||||
# include <cuda_runtime.h>
|
||||
# include <npp.h>
|
||||
# include "opencv2/core/gpu_stream_accessor.hpp"
|
||||
# include "opencv2/core/cuda_stream_accessor.hpp"
|
||||
# include "opencv2/core/cuda/common.hpp"
|
||||
|
||||
# define NPP_VERSION (NPP_VERSION_MAJOR * 1000 + NPP_VERSION_MINOR * 100 + NPP_VERSION_BUILD)
|
Reference in New Issue
Block a user