removed obsolete DevMem2D class

diff --git a/modules/core/include/opencv2/core/gpu.hpp b/modules/core/include/opencv2/core/gpu.hpp
index 9ce2b1f..3c710b7 100644 (file)
--- a/modules/core/include/opencv2/core/gpu.hpp
+++ b/modules/core/include/opencv2/core/gpu.hpp
@@ -418,11 +418,6 @@ public:
     template <typename _Tp> operator PtrStepSz<_Tp>() const;
     template <typename _Tp> operator PtrStep<_Tp>() const;
 
-    // Deprecated function
-    __CV_GPU_DEPR_BEFORE__ template <typename _Tp> 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<T>() const
     return PtrStep<T>((T*)data, step);
 }
 
-template <class T> inline
-GpuMat::operator DevMem2D_<T>() const
-{
-    return DevMem2D_<T>(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 1370c6f..b27a6fb 100644 (file)
--- 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<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;
     }
 }