third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

videoio: apply CV_OVERRIDE/CV_FINAL

Browse Source
This commit is contained in:
Alexander Alekhin
2018-03-15 16:16:53 +03:00
parent a91953b15c
commit 8f0669c300
26 changed files with 138 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/src/cap_gphoto2.cpp
+8 -8
View File
@@ -65,7 +65,7 @@ public:
result = gPhoto2Result;
method = methodStr;
}
virtual const char * what() const throw ()
virtual const char * what() const throw() CV_OVERRIDE
{
return gp_result_as_string(result);
}
@@ -137,14 +137,14 @@ public:
DigitalCameraCapture();
DigitalCameraCapture(int index);
DigitalCameraCapture(const String &deviceName);
virtual ~DigitalCameraCapture();
virtual ~DigitalCameraCapture() CV_OVERRIDE;
virtual bool isOpened() const;
virtual double getProperty(int) const;
virtual bool setProperty(int, double);
virtual bool grabFrame();
virtual bool retrieveFrame(int, OutputArray);
virtual int getCaptureDomain()
virtual bool isOpened() const CV_OVERRIDE;
virtual double getProperty(int) const CV_OVERRIDE;
virtual bool setProperty(int, double) CV_OVERRIDE;
virtual bool grabFrame() CV_OVERRIDE;
virtual bool retrieveFrame(int, OutputArray) CV_OVERRIDE;
virtual int getCaptureDomain() CV_OVERRIDE
{
return CV_CAP_GPHOTO2;
} // Return the type of the capture object: CV_CAP_VFW, etc...