Commit 12cd33c9 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky Committed by GitHub

Merge pull request #790 from jiuerbujie/omnidir_camera_calib

revise omnidir::calibrate API (InputArray to InpurArrayOfArray) 
parents 41b0a71a 7d238cfc
...@@ -168,7 +168,7 @@ namespace omnidir ...@@ -168,7 +168,7 @@ namespace omnidir
@param idx Indices of images that pass initialization, which are really used in calibration. So the size of rvecs is the @param idx Indices of images that pass initialization, which are really used in calibration. So the size of rvecs is the
same as idx.total(). same as idx.total().
*/ */
CV_EXPORTS_W double calibrate(InputArray objectPoints, InputArray imagePoints, Size size, CV_EXPORTS_W double calibrate(InputArrayOfArrays objectPoints, InputArrayOfArrays imagePoints, Size size,
InputOutputArray K, InputOutputArray xi, InputOutputArray D, OutputArrayOfArrays rvecs, OutputArrayOfArrays tvecs, InputOutputArray K, InputOutputArray xi, InputOutputArray D, OutputArrayOfArrays rvecs, OutputArrayOfArrays tvecs,
int flags, TermCriteria criteria, OutputArray idx=noArray()); int flags, TermCriteria criteria, OutputArray idx=noArray());
......
...@@ -1058,7 +1058,7 @@ void cv::omnidir::internal::compose_motion(InputArray _om1, InputArray _T1, Inpu ...@@ -1058,7 +1058,7 @@ void cv::omnidir::internal::compose_motion(InputArray _om1, InputArray _T1, Inpu
dT3dom1 = Mat::zeros(3, 3, CV_64FC1); dT3dom1 = Mat::zeros(3, 3, CV_64FC1);
} }
double cv::omnidir::calibrate(InputArray patternPoints, InputArray imagePoints, Size size, double cv::omnidir::calibrate(InputArrayOfArrays patternPoints, InputArrayOfArrays imagePoints, Size size,
InputOutputArray K, InputOutputArray xi, InputOutputArray D, OutputArrayOfArrays omAll, OutputArrayOfArrays tAll, InputOutputArray K, InputOutputArray xi, InputOutputArray D, OutputArrayOfArrays omAll, OutputArrayOfArrays tAll,
int flags, TermCriteria criteria, OutputArray idx) int flags, TermCriteria criteria, OutputArray idx)
{ {
......
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