mirrors/opencv
2
0 Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-10-02 04:02:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

videoio: apply CV_OVERRIDE/CV_FINAL

Browse Source
This commit is contained in:
Alexander Alekhin committed 2018-03-28 17:57:59 +03:00
1 parent a91953b15c
commit 8f0669c300
26 files changed
+138 -140
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/videoio/src/cap_ffmpeg.cpp
+7 -7
View File
@@ -196,26 +196,26 @@ private:
};
class CvCapture_FFMPEG_proxy :
class CvCapture_FFMPEG_proxy CV_FINAL :
public CvCapture
{
public:
CvCapture_FFMPEG_proxy() { ffmpegCapture = 0; }
virtual ~CvCapture_FFMPEG_proxy() { close(); }
virtual double getProperty(int propId) const
virtual double getProperty(int propId) const CV_OVERRIDE
{
return ffmpegCapture ? icvGetCaptureProperty_FFMPEG_p(ffmpegCapture, propId) : 0;
}
virtual bool setProperty(int propId, double value)
virtual bool setProperty(int propId, double value) CV_OVERRIDE
{
return ffmpegCapture ? icvSetCaptureProperty_FFMPEG_p(ffmpegCapture, propId, value)!=0 : false;
}
virtual bool grabFrame()
virtual bool grabFrame() CV_OVERRIDE
{
return ffmpegCapture ? icvGrabFrame_FFMPEG_p(ffmpegCapture)!=0 : false;
}
virtual IplImage* retrieveFrame(int)
virtual IplImage* retrieveFrame(int) CV_OVERRIDE
{
unsigned char* data = 0;
int step=0, width=0, height=0, cn=0;
@@ -260,14 +260,14 @@ CvCapture* cvCreateFileCapture_FFMPEG_proxy(const char * filename)
return 0;
}
class CvVideoWriter_FFMPEG_proxy :
class CvVideoWriter_FFMPEG_proxy CV_FINAL :
public CvVideoWriter
{
public:
CvVideoWriter_FFMPEG_proxy() { ffmpegWriter = 0; }
virtual ~CvVideoWriter_FFMPEG_proxy() { close(); }
virtual bool writeFrame( const IplImage* image )
virtual bool writeFrame( const IplImage* image ) CV_OVERRIDE
{
if(!ffmpegWriter)
return false;