Skip to content

Commit 26a32dc

Browse files
committed
videoio: remove 'const' from getProperty
'const' is available in OpenCV 3.x only
1 parent 9ff63a4 commit 26a32dc

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

modules/highgui/src/cap_avfoundation_mac.mm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ - (IplImage*)getOutput;
9595
~CvCaptureCAM();
9696
virtual bool grabFrame();
9797
virtual IplImage* retrieveFrame(int);
98-
virtual double getProperty(int property_id) const;
98+
virtual double getProperty(int property_id);
9999
virtual bool setProperty(int property_id, double value);
100100
virtual int didStart();
101101

@@ -138,7 +138,7 @@ - (IplImage*)getOutput;
138138
~CvCaptureFile();
139139
virtual bool grabFrame();
140140
virtual IplImage* retrieveFrame(int);
141-
virtual double getProperty(int property_id) const;
141+
virtual double getProperty(int property_id);
142142
virtual bool setProperty(int property_id, double value);
143143
virtual int didStart();
144144

@@ -411,7 +411,7 @@ - (IplImage*)getOutput;
411411
}
412412

413413

414-
double CvCaptureCAM::getProperty(int property_id) const{
414+
double CvCaptureCAM::getProperty(int property_id) {
415415
NSAutoreleasePool *localpool = [[NSAutoreleasePool alloc] init];
416416

417417
CMFormatDescriptionRef format = mCaptureDevice.activeFormat.formatDescription;
@@ -1024,7 +1024,7 @@ -(int) updateImage {
10241024
return retrieveFramePixelBuffer();
10251025
}
10261026

1027-
double CvCaptureFile::getProperty(int property_id) const{
1027+
double CvCaptureFile::getProperty(int property_id) {
10281028
if (mAsset == nil) return 0;
10291029

10301030
CMTime t;

0 commit comments

Comments
 (0)