diff --git a/modules/core/include/opencv2/core/gpu.hpp b/modules/core/include/opencv2/core/gpu.hpp index 3ab299cf3cbf..9bacfc1a2690 100644 --- a/modules/core/include/opencv2/core/gpu.hpp +++ b/modules/core/include/opencv2/core/gpu.hpp @@ -375,19 +375,6 @@ class CV_EXPORTS Stream //! returns true if stream object is not default (!= 0) operator bool_type() const; - // obsolete methods - - void enqueueDownload(const GpuMat& src, OutputArray dst); - - void enqueueUpload(InputArray src, GpuMat& dst); - - void enqueueCopy(const GpuMat& src, OutputArray dst); - - void enqueueMemSet(GpuMat& src, Scalar val); - void enqueueMemSet(GpuMat& src, Scalar val, InputArray mask); - - void enqueueConvert(const GpuMat& src, OutputArray dst, int dtype, double alpha = 1.0, double beta = 0.0); - class Impl; private: diff --git a/modules/core/include/opencv2/core/gpu.inl.hpp b/modules/core/include/opencv2/core/gpu.inl.hpp index 2d08c4436fd6..13861170cb97 100644 --- a/modules/core/include/opencv2/core/gpu.inl.hpp +++ b/modules/core/include/opencv2/core/gpu.inl.hpp @@ -525,42 +525,6 @@ void swap(CudaMem& a, CudaMem& b) //////////////////////////////// Stream /////////////////////////////// -inline -void Stream::enqueueDownload(const GpuMat& src, OutputArray dst) -{ - src.download(dst, *this); -} - -inline -void Stream::enqueueUpload(InputArray src, GpuMat& dst) -{ - dst.upload(src, *this); -} - -inline -void Stream::enqueueCopy(const GpuMat& src, OutputArray dst) -{ - src.copyTo(dst, *this); -} - -inline -void Stream::enqueueMemSet(GpuMat& src, Scalar val) -{ - src.setTo(val, *this); -} - -inline -void Stream::enqueueMemSet(GpuMat& src, Scalar val, InputArray mask) -{ - src.setTo(val, mask, *this); -} - -inline -void Stream::enqueueConvert(const GpuMat& src, OutputArray dst, int dtype, double alpha, double beta) -{ - src.convertTo(dst, dtype, alpha, beta, *this); -} - inline Stream::Stream(const Ptr& impl) : impl_(impl)