imgproc: slightly change the signature of undistortPoints overload

sovrasov · sovrasov · commit b421ebef86df · 2017-09-14T12:19:40.000+03:00
diff --git a/modules/calib3d/test/test_undistort_points.cpp b/modules/calib3d/test/test_undistort_points.cpp
@@ -107,7 +107,7 @@ TEST(Calib3d_Undistort, stop_criteria)
     const double maxError = 1e-6;
     TermCriteria criteria(TermCriteria::MAX_ITER + TermCriteria::EPS, 100, maxError);
     std::vector<Point2d> pt_undist_vec;
-    undistortPoints(pt_distorted_vec, pt_undist_vec, cameraMatrix, distCoeffs, criteria);
+    undistortPoints(pt_distorted_vec, pt_undist_vec, cameraMatrix, distCoeffs, noArray(), noArray(), criteria);
 
     std::vector<Point2d> pt_redistorted_vec;
     std::vector<Point3d> pt_undist_vec_homogeneous;
diff --git a/modules/imgproc/include/opencv2/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc.hpp
@@ -3040,10 +3040,9 @@ CV_EXPORTS_W void undistortPoints( InputArray src, OutputArray dst,
     @note Default version of cv::undistortPoints does 5 iterations to compute undistorted points.
 
  */
-CV_EXPORTS_AS(undistortPointsExt) void undistortPoints( InputArray src, OutputArray dst,
+CV_EXPORTS_AS(undistortPointsIter) void undistortPoints( InputArray src, OutputArray dst,
                                    InputArray cameraMatrix, InputArray distCoeffs,
-                                   TermCriteria criteria,
-                                   InputArray R = noArray(), InputArray P = noArray());
+                                   InputArray R, InputArray P, TermCriteria criteria);
 
 //! @} imgproc_transform
 
diff --git a/modules/imgproc/src/undistort.cpp b/modules/imgproc/src/undistort.cpp
@@ -475,15 +475,15 @@ void cv::undistortPoints( InputArray _src, OutputArray _dst,
                           InputArray _Rmat,
                           InputArray _Pmat )
 {
-    undistortPoints(_src, _dst, _cameraMatrix, _distCoeffs, TermCriteria(TermCriteria::MAX_ITER, 5, 0.01), _Rmat, _Pmat);
+    undistortPoints(_src, _dst, _cameraMatrix, _distCoeffs, _Rmat, _Pmat, TermCriteria(TermCriteria::MAX_ITER, 5, 0.01));
 }
 
 void cv::undistortPoints( InputArray _src, OutputArray _dst,
                           InputArray _cameraMatrix,
                           InputArray _distCoeffs,
-                          TermCriteria criteria,
                           InputArray _Rmat,
-                          InputArray _Pmat )
+                          InputArray _Pmat,
+                          TermCriteria criteria)
 {
     Mat src = _src.getMat(), cameraMatrix = _cameraMatrix.getMat();
     Mat distCoeffs = _distCoeffs.getMat(), R = _Rmat.getMat(), P = _Pmat.getMat();

Original file line number	Diff line number	Diff line change
`@@ -475,15 +475,15 @@ void cv::undistortPoints( InputArray _src, OutputArray _dst,`
`475`	`475`	`InputArray _Rmat,`
`476`	`476`	`InputArray _Pmat )`
`477`	`477`	`{`
`478`		`- undistortPoints(_src, _dst, _cameraMatrix, _distCoeffs, TermCriteria(TermCriteria::MAX_ITER, 5, 0.01), _Rmat, _Pmat);`
	`478`	`+ undistortPoints(_src, _dst, _cameraMatrix, _distCoeffs, _Rmat, _Pmat, TermCriteria(TermCriteria::MAX_ITER, 5, 0.01));`
`479`	`479`	`}`
`480`	`480`
`481`	`481`	`void cv::undistortPoints( InputArray _src, OutputArray _dst,`
`482`	`482`	`InputArray _cameraMatrix,`
`483`	`483`	`InputArray _distCoeffs,`
`484`		`- TermCriteria criteria,`
`485`	`484`	`InputArray _Rmat,`
`486`		`- InputArray _Pmat )`
	`485`	`+ InputArray _Pmat,`
	`486`	`+ TermCriteria criteria)`
`487`	`487`	`{`
`488`	`488`	`Mat src = _src.getMat(), cameraMatrix = _cameraMatrix.getMat();`
`489`	`489`	`Mat distCoeffs = _distCoeffs.getMat(), R = _Rmat.getMat(), P = _Pmat.getMat();`