diff --git a/modules/videoio/include/opencv2/videoio.hpp b/modules/videoio/include/opencv2/videoio.hpp index 7688718c47..34e95421f8 100644 --- a/modules/videoio/include/opencv2/videoio.hpp +++ b/modules/videoio/include/opencv2/videoio.hpp @@ -66,9 +66,6 @@ ////////////////////////////////// video io ///////////////////////////////// -typedef struct CvCapture CvCapture; -typedef struct CvVideoWriter CvVideoWriter; - namespace cv { @@ -1060,7 +1057,6 @@ public: int64 timeoutNs = 0); protected: - Ptr cap; Ptr icap; bool throwOnFail; @@ -1239,18 +1235,12 @@ public: CV_WRAP String getBackendName() const; protected: - Ptr writer; Ptr iwriter; static Ptr create(const String& filename, int fourcc, double fps, Size frameSize, bool isColor = true); }; -//! @cond IGNORED -template<> struct DefaultDeleter{ CV_EXPORTS void operator ()(CvCapture* obj) const; }; -template<> struct DefaultDeleter{ CV_EXPORTS void operator ()(CvVideoWriter* obj) const; }; -//! @endcond IGNORED - //! @} videoio } // cv diff --git a/modules/videoio/src/cap.cpp b/modules/videoio/src/cap.cpp index 45dba466ea..9118ac8cdb 100644 --- a/modules/videoio/src/cap.cpp +++ b/modules/videoio/src/cap.cpp @@ -62,9 +62,6 @@ static bool param_VIDEOWRITER_DEBUG = utils::getConfigurationParameterBool("OPEN CV_LOG_WARNING(nullptr, __VA_ARGS__) \ } -void DefaultDeleter::operator ()(CvCapture* obj) const { cvReleaseCapture(&obj); } -void DefaultDeleter::operator ()(CvVideoWriter* obj) const { cvReleaseVideoWriter(&obj); } - IStreamReader::~IStreamReader() { // nothing