mirror of
https://github.com/opencv/opencv.git
synced 2025-06-07 17:44:04 +08:00
Merge pull request #18914 from alalek:videoio_fix_missing_get_capture_domain
This commit is contained in:
commit
f601e817fe
@ -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;
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user