Commit 36db16a0 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #7383 from alalek:fix_get_property

parents 9ff63a46 26a32dcb
...@@ -95,7 +95,7 @@ public: ...@@ -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: ...@@ -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() { ...@@ -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) { ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment