Merge pull request opencv#7625 from souch55:Fixapi

alalek · alalek · commit 12569dc73058 · 2016-11-17T17:54:25.000Z
diff --git a/modules/videoio/include/opencv2/videoio.hpp b/modules/videoio/include/opencv2/videoio.hpp
@@ -650,6 +650,16 @@ class CV_EXPORTS_W VideoCapture
     */
     CV_WRAP virtual bool open(int index);
 
+   /** @brief  Open a camera for video capturing
+
+    @overload
+
+    This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.
+    Parameters are similar as the constructor VideoCapture(int index),except it takes an additional argument apiPreference.
+    @return open(cameraNum + apiPreference).
+    */
+    CV_WRAP bool open(int cameraNum, int apiPreference);
+
     /** @brief Returns true if video capturing has been initialized already.
 
     If the previous call to VideoCapture constructor or VideoCapture::open() succeeded, the method returns
diff --git a/modules/videoio/src/cap.cpp b/modules/videoio/src/cap.cpp
@@ -606,6 +606,11 @@ bool VideoCapture::open(int index)
     cap.reset(cvCreateCameraCapture(index));
     return isOpened();
 }
+bool  VideoCapture::open(int cameraNum, int apiPreference)
+{
+    cameraNum = cameraNum + apiPreference;
+    return open(cameraNum);
+}
 
 bool VideoCapture::isOpened() const
 {

Original file line number	Diff line number	Diff line change
`@@ -606,6 +606,11 @@ bool VideoCapture::open(int index)`
`606`	`606`	`cap.reset(cvCreateCameraCapture(index));`
`607`	`607`	`return isOpened();`
`608`	`608`	`}`
	`609`	`+bool VideoCapture::open(int cameraNum, int apiPreference)`
	`610`	`+{`
	`611`	`+ cameraNum = cameraNum + apiPreference;`
	`612`	`+ return open(cameraNum);`
	`613`	`+}`
`609`	`614`
`610`	`615`	`bool VideoCapture::isOpened() const`
`611`	`616`	`{`