Commit d7597a86 authored by Alexander Alekhin's avatar Alexander Alekhin

videoio: do not mix `CV_CAP` and `CAP_` APIs enum values

parent 460e9bf0
{ {
"const_ignore_list": [ "const_ignore_list": [
"CV_CAP_OPENNI", "CV_CAP_OPENNI",
"CV_CAP_OPENNI2",
"CV_CAP_PROP_OPENNI_", "CV_CAP_PROP_OPENNI_",
"CV_CAP_INTELPERC", "CV_CAP_INTELPERC",
"CV_CAP_PROP_INTELPERC_", "CV_CAP_PROP_INTELPERC_",
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
"CV_CAP_UNICAP", "CV_CAP_UNICAP",
"CV_CAP_DSHOW", "CV_CAP_DSHOW",
"CV_CAP_PVAPI", "CV_CAP_PVAPI",
"CV_CAP_ARAVIS",
"CV_CAP_PROP_DC1394_OFF", "CV_CAP_PROP_DC1394_OFF",
"CV_CAP_PROP_DC1394_MODE_MANUAL", "CV_CAP_PROP_DC1394_MODE_MANUAL",
"CV_CAP_PROP_DC1394_MODE_AUTO", "CV_CAP_PROP_DC1394_MODE_AUTO",
......
This diff is collapsed.
...@@ -109,7 +109,7 @@ public: ...@@ -109,7 +109,7 @@ public:
virtual IplImage* retrieveFrame(int); virtual IplImage* retrieveFrame(int);
virtual int getCaptureDomain() virtual int getCaptureDomain()
{ {
return CV_CAP_ARAVIS; return cv::CAP_ARAVIS;
} }
protected: protected:
......
...@@ -90,7 +90,7 @@ struct CvCapture ...@@ -90,7 +90,7 @@ struct CvCapture
virtual bool setProperty(int, double) { return 0; } virtual bool setProperty(int, double) { return 0; }
virtual bool grabFrame() { return true; } virtual bool grabFrame() { return true; }
virtual IplImage* retrieveFrame(int) { return 0; } virtual IplImage* retrieveFrame(int) { return 0; }
virtual int getCaptureDomain() { return CV_CAP_ANY; } // Return the type of the capture object: CV_CAP_VFW, etc... virtual int getCaptureDomain() { return cv::CAP_ANY; } // Return the type of the capture object: CAP_VFW, etc...
}; };
/*************************** CvVideoWriter structure ****************************/ /*************************** CvVideoWriter structure ****************************/
......
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