From 70d2c57e35705b674c160baf5c636bb3b6d6d91c Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Mon, 29 Nov 2010 20:51:02 +0000 Subject: [PATCH] moved estimateAffine3D declaration from imgproc to calib3d, where it is really implemented (ticket #705) --- modules/calib3d/include/opencv2/calib3d/calib3d.hpp | 5 +++++ modules/imgproc/include/opencv2/imgproc/imgproc.hpp | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/calib3d/include/opencv2/calib3d/calib3d.hpp b/modules/calib3d/include/opencv2/calib3d/calib3d.hpp index 21352c5fc..547fbb959 100644 --- a/modules/calib3d/include/opencv2/calib3d/calib3d.hpp +++ b/modules/calib3d/include/opencv2/calib3d/calib3d.hpp @@ -453,6 +453,11 @@ CV_EXPORTS_W Mat findHomography( const Mat& srcPoints, const Mat& dstPoints, int method=0, double ransacReprojThreshold=3 ); +//! computes the best-fit affine transformation that maps one 3D point set to another (RANSAC algorithm is used) +CV_EXPORTS int estimateAffine3D(const Mat& from, const Mat& to, CV_OUT Mat& dst, + CV_OUT vector& outliers, + double param1 = 3.0, double param2 = 0.99); + //! Computes RQ decomposition of 3x3 matrix CV_EXPORTS void RQDecomp3x3( const Mat& M, Mat& R, Mat& Q ); diff --git a/modules/imgproc/include/opencv2/imgproc/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc/imgproc.hpp index f22aa8ba6..2535682a1 100644 --- a/modules/imgproc/include/opencv2/imgproc/imgproc.hpp +++ b/modules/imgproc/include/opencv2/imgproc/imgproc.hpp @@ -844,11 +844,6 @@ CV_EXPORTS_W double pointPolygonTest( const Mat& contour, //! estimates the best-fit affine transformation that maps one 2D point set to another or one image to another. CV_EXPORTS_W Mat estimateRigidTransform( const Mat& A, const Mat& B, bool fullAffine ); - -//! computes the best-fit affine transformation that maps one 3D point set to another (RANSAC algorithm is used) -CV_EXPORTS int estimateAffine3D(const Mat& from, const Mat& to, CV_OUT Mat& dst, - CV_OUT vector& outliers, - double param1 = 3.0, double param2 = 0.99); }