mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-27 06:51:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7383 from alalek:fix_get_property

Browse Source
This commit is contained in:
Alexander Alekhin 2016-10-02 11:34:36 +00:00
commit 36db16a00d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/highgui/src/cap_avfoundation_mac.mm
View File

@ -95,7 +95,7 @@ public:
~CvCaptureCAM(); ~CvCaptureCAM();
virtual bool grabFrame(); virtual bool grabFrame();
virtual IplImage* retrieveFrame(int); 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 bool setProperty(int property_id, double value);
virtual int didStart(); virtual int didStart();
@ -138,7 +138,7 @@ public:
~CvCaptureFile(); ~CvCaptureFile();
virtual bool grabFrame(); virtual bool grabFrame();
virtual IplImage* retrieveFrame(int); 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 bool setProperty(int property_id, double value);
virtual int didStart(); 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]; NSAutoreleasePool *localpool = [[NSAutoreleasePool alloc] init];
CMFormatDescriptionRef format = mCaptureDevice.activeFormat.formatDescription; CMFormatDescriptionRef format = mCaptureDevice.activeFormat.formatDescription;
@ -1024,7 +1024,7 @@ IplImage* CvCaptureFile::retrieveFrame(int) {
return retrieveFramePixelBuffer(); return retrieveFramePixelBuffer();
} }
double CvCaptureFile::getProperty(int property_id) const{ double CvCaptureFile::getProperty(int property_id) {
if (mAsset == nil) return 0; if (mAsset == nil) return 0;
CMTime t; CMTime t;