[opencv] 05/89: videoio: remove 'const' from getProperty
Nobuhiro Iwamatsu
iwamatsu at moszumanska.debian.org
Sat May 13 09:57:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
iwamatsu pushed a commit to annotated tag 2.4.13.2
in repository opencv.
commit 26a32dcbf60ffd05fb7262bb4d211bef9f18f4b1
Author: Alexander Alekhin <alexander.a.alekhin at gmail.com>
Date: Sun Oct 2 03:04:37 2016 +0300
videoio: remove 'const' from getProperty
'const' is available in OpenCV 3.x only
---
modules/highgui/src/cap_avfoundation_mac.mm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/highgui/src/cap_avfoundation_mac.mm b/modules/highgui/src/cap_avfoundation_mac.mm
index a7b8895..5b24263 100644
--- a/modules/highgui/src/cap_avfoundation_mac.mm
+++ b/modules/highgui/src/cap_avfoundation_mac.mm
@@ -95,7 +95,7 @@ public:
~CvCaptureCAM();
virtual bool grabFrame();
virtual IplImage* retrieveFrame(int);
- virtual double getProperty(int property_id) const;
+ virtual double getProperty(int property_id);
virtual bool setProperty(int property_id, double value);
virtual int didStart();
@@ -138,7 +138,7 @@ public:
~CvCaptureFile();
virtual bool grabFrame();
virtual IplImage* retrieveFrame(int);
- virtual double getProperty(int property_id) const;
+ virtual double getProperty(int property_id);
virtual bool setProperty(int property_id, double value);
virtual int didStart();
@@ -411,7 +411,7 @@ void CvCaptureCAM::setWidthHeight() {
}
-double CvCaptureCAM::getProperty(int property_id) const{
+double CvCaptureCAM::getProperty(int property_id) {
NSAutoreleasePool *localpool = [[NSAutoreleasePool alloc] init];
CMFormatDescriptionRef format = mCaptureDevice.activeFormat.formatDescription;
@@ -1024,7 +1024,7 @@ IplImage* CvCaptureFile::retrieveFrame(int) {
return retrieveFramePixelBuffer();
}
-double CvCaptureFile::getProperty(int property_id) const{
+double CvCaptureFile::getProperty(int property_id) {
if (mAsset == nil) return 0;
CMTime t;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git
More information about the debian-science-commits
mailing list