|
|
|
@ -120,33 +120,6 @@ namespace cv |
|
|
|
|
typedef PtrStep<unsigned char> PtrStepb; |
|
|
|
|
typedef PtrStep<float> PtrStepf; |
|
|
|
|
typedef PtrStep<int> PtrStepi; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if defined __GNUC__ |
|
|
|
|
#define __CV_GPU_DEPR_BEFORE__ |
|
|
|
|
#define __CV_GPU_DEPR_AFTER__ __attribute__ ((deprecated)) |
|
|
|
|
#elif defined(__MSVC__) //|| defined(__CUDACC__)
|
|
|
|
|
#pragma deprecated(DevMem2D_) |
|
|
|
|
#define __CV_GPU_DEPR_BEFORE__ __declspec(deprecated) |
|
|
|
|
#define __CV_GPU_DEPR_AFTER__ |
|
|
|
|
#else |
|
|
|
|
#define __CV_GPU_DEPR_BEFORE__ |
|
|
|
|
#define __CV_GPU_DEPR_AFTER__ |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
template <typename T> struct __CV_GPU_DEPR_BEFORE__ DevMem2D_ : public PtrStepSz<T> |
|
|
|
|
{ |
|
|
|
|
DevMem2D_() {} |
|
|
|
|
DevMem2D_(int rows_, int cols_, T* data_, size_t step_) : PtrStepSz<T>(rows_, cols_, data_, step_) {} |
|
|
|
|
|
|
|
|
|
template <typename U> |
|
|
|
|
explicit __CV_GPU_DEPR_BEFORE__ DevMem2D_(const DevMem2D_<U>& d) : PtrStepSz<T>(d.rows, d.cols, (T*)d.data, d.step) {} |
|
|
|
|
} __CV_GPU_DEPR_AFTER__ ; |
|
|
|
|
|
|
|
|
|
typedef DevMem2D_<unsigned char> DevMem2Db; |
|
|
|
|
typedef DevMem2Db DevMem2D; |
|
|
|
|
typedef DevMem2D_<float> DevMem2Df; |
|
|
|
|
typedef DevMem2D_<int> DevMem2Di; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|