Merge pull request #18914 from alalek:videoio_fix_missing_get_capture_domain

This commit is contained in:
Alexander Alekhin 2020-11-25 13:46:57 +00:00
commit f601e817fe
2 changed files with 2 additions and 0 deletions

View File

@ -311,6 +311,7 @@ public:
virtual bool setProperty(int probIdx, double propVal) CV_OVERRIDE; virtual bool setProperty(int probIdx, double propVal) CV_OVERRIDE;
virtual bool grabFrame() CV_OVERRIDE; virtual bool grabFrame() CV_OVERRIDE;
virtual IplImage* retrieveFrame(int outputType) CV_OVERRIDE; virtual IplImage* retrieveFrame(int outputType) CV_OVERRIDE;
virtual int getCaptureDomain() CV_OVERRIDE { return cv::CAP_OPENNI; }
bool isOpened() const; bool isOpened() const;

View File

@ -119,6 +119,7 @@ public:
virtual bool setProperty(int probIdx, double propVal) CV_OVERRIDE; virtual bool setProperty(int probIdx, double propVal) CV_OVERRIDE;
virtual bool grabFrame() CV_OVERRIDE; virtual bool grabFrame() CV_OVERRIDE;
virtual IplImage* retrieveFrame(int outputType) CV_OVERRIDE; virtual IplImage* retrieveFrame(int outputType) CV_OVERRIDE;
virtual int getCaptureDomain() CV_OVERRIDE { return cv::CAP_OPENNI2; }
bool isOpened() const; bool isOpened() const;