From b421ebef86df409b75ccda1d224dbf4eff2a4d80 Mon Sep 17 00:00:00 2001
From: Vladislav Sovrasov <sovrasov.vlad@gmail.com>
Date: Thu, 14 Sep 2017 11:13:36 +0300
Subject: [PATCH] imgproc: slightly change the signature of undistortPoints
 overload

---
 modules/calib3d/test/test_undistort_points.cpp | 2 +-
 modules/imgproc/include/opencv2/imgproc.hpp    | 5 ++---
 modules/imgproc/src/undistort.cpp              | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/calib3d/test/test_undistort_points.cpp b/modules/calib3d/test/test_undistort_points.cpp
index 79e25f68e6..cc9006cce5 100644
--- 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
index 13032e8e82..d1950e47cc 100644
--- 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
index ce2ba14251..0ee79974db 100644
--- 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();