diff --git a/modules/core/include/opencv2/core/gpu.hpp b/modules/core/include/opencv2/core/gpu.hpp index 9ce2b1faf1734599fbd7d46d6d9451750ccdaaa3..3c710b713c180921c19e28c5a54135a3a7db974a 100644 --- a/modules/core/include/opencv2/core/gpu.hpp +++ b/modules/core/include/opencv2/core/gpu.hpp @@ -418,11 +418,6 @@ public: template operator PtrStepSz<_Tp>() const; template operator PtrStep<_Tp>() const; - // Deprecated function - __CV_GPU_DEPR_BEFORE__ template operator DevMem2D_<_Tp>() const __CV_GPU_DEPR_AFTER__; - #undef __CV_GPU_DEPR_BEFORE__ - #undef __CV_GPU_DEPR_AFTER__ - /*! includes several bit-fields: - the magic signature - continuity flag @@ -681,12 +676,6 @@ GpuMat::operator PtrStep() const return PtrStep((T*)data, step); } -template inline -GpuMat::operator DevMem2D_() const -{ - return DevMem2D_(rows, cols, (T*)data, step); -} - static inline void swap(GpuMat& a, GpuMat& b) { diff --git a/modules/core/include/opencv2/core/gpu_types.hpp b/modules/core/include/opencv2/core/gpu_types.hpp index 1370c6f620973ebd5f2ac9c57e90979b724ee7e0..b27a6fb3fda4228a6dc33bb19385b84addd32802 100644 --- a/modules/core/include/opencv2/core/gpu_types.hpp +++ b/modules/core/include/opencv2/core/gpu_types.hpp @@ -120,33 +120,6 @@ namespace cv typedef PtrStep PtrStepb; typedef PtrStep PtrStepf; typedef PtrStep 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 struct __CV_GPU_DEPR_BEFORE__ DevMem2D_ : public PtrStepSz - { - DevMem2D_() {} - DevMem2D_(int rows_, int cols_, T* data_, size_t step_) : PtrStepSz(rows_, cols_, data_, step_) {} - - template - explicit __CV_GPU_DEPR_BEFORE__ DevMem2D_(const DevMem2D_& d) : PtrStepSz(d.rows, d.cols, (T*)d.data, d.step) {} - } __CV_GPU_DEPR_AFTER__ ; - - typedef DevMem2D_ DevMem2Db; - typedef DevMem2Db DevMem2D; - typedef DevMem2D_ DevMem2Df; - typedef DevMem2D_ DevMem2Di; } }