mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

imgproc: slightly change the signature of undistortPoints overload

Browse Source
This commit is contained in:
Vladislav Sovrasov 2017-09-14 11:13:36 +03:00
parent 701c7e5685
commit b421ebef86
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/calib3d/test/test_undistort_points.cpp
View File

@ -107,7 +107,7 @@ TEST(Calib3d_Undistort, stop_criteria)
const double maxError = 1e-6; const double maxError = 1e-6;
TermCriteria criteria(TermCriteria::MAX_ITER + TermCriteria::EPS, 100, maxError); TermCriteria criteria(TermCriteria::MAX_ITER + TermCriteria::EPS, 100, maxError);
std::vector<Point2d> pt_undist_vec; 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<Point2d> pt_redistorted_vec;
std::vector<Point3d> pt_undist_vec_homogeneous; std::vector<Point3d> pt_undist_vec_homogeneous;

5
modules/imgproc/include/opencv2/imgproc.hpp
View File

@ -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. @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, InputArray cameraMatrix, InputArray distCoeffs,
TermCriteria criteria, InputArray R, InputArray P, TermCriteria criteria);
InputArray R = noArray(), InputArray P = noArray());
//! @} imgproc_transform //! @} imgproc_transform

6
modules/imgproc/src/undistort.cpp
View File

@ -475,15 +475,15 @@ void cv::undistortPoints( InputArray _src, OutputArray _dst,
InputArray _Rmat, InputArray _Rmat,
InputArray _Pmat ) 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, void cv::undistortPoints( InputArray _src, OutputArray _dst,
InputArray _cameraMatrix, InputArray _cameraMatrix,
InputArray _distCoeffs, InputArray _distCoeffs,
TermCriteria criteria,
InputArray _Rmat, InputArray _Rmat,
InputArray _Pmat ) InputArray _Pmat,
TermCriteria criteria)
{ {
Mat src = _src.getMat(), cameraMatrix = _cameraMatrix.getMat(); Mat src = _src.getMat(), cameraMatrix = _cameraMatrix.getMat();
Mat distCoeffs = _distCoeffs.getMat(), R = _Rmat.getMat(), P = _Pmat.getMat(); Mat distCoeffs = _distCoeffs.getMat(), R = _Rmat.getMat(), P = _Pmat.getMat();