Commit 01848505 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

Merge pull request #7415 from StevenPuttemans:fix_issue_7409

parents 770c69a9 524c6127
...@@ -388,7 +388,7 @@ and a rotation matrix. ...@@ -388,7 +388,7 @@ and a rotation matrix.
It optionally returns three rotation matrices, one for each axis, and the three Euler angles in It optionally returns three rotation matrices, one for each axis, and the three Euler angles in
degrees (as the return value) that could be used in OpenGL. Note, there is always more than one degrees (as the return value) that could be used in OpenGL. Note, there is always more than one
sequence of rotations about the three principle axes that results in the same orientation of an sequence of rotations about the three principal axes that results in the same orientation of an
object, eg. see @cite Slabaugh . Returned tree rotation matrices and corresponding three Euler angules object, eg. see @cite Slabaugh . Returned tree rotation matrices and corresponding three Euler angules
are only one of the possible solutions. are only one of the possible solutions.
*/ */
...@@ -414,7 +414,7 @@ matrix and the position of a camera. ...@@ -414,7 +414,7 @@ matrix and the position of a camera.
It optionally returns three rotation matrices, one for each axis, and three Euler angles that could It optionally returns three rotation matrices, one for each axis, and three Euler angles that could
be used in OpenGL. Note, there is always more than one sequence of rotations about the three be used in OpenGL. Note, there is always more than one sequence of rotations about the three
principle axes that results in the same orientation of an object, eg. see @cite Slabaugh . Returned principal axes that results in the same orientation of an object, eg. see @cite Slabaugh . Returned
tree rotation matrices and corresponding three Euler angules are only one of the possible solutions. tree rotation matrices and corresponding three Euler angules are only one of the possible solutions.
The function is based on RQDecomp3x3 . The function is based on RQDecomp3x3 .
...@@ -1304,8 +1304,8 @@ CV_EXPORTS_W Mat findEssentialMat( InputArray points1, InputArray points2, ...@@ -1304,8 +1304,8 @@ CV_EXPORTS_W Mat findEssentialMat( InputArray points1, InputArray points2,
be floating-point (single or double precision). be floating-point (single or double precision).
@param points2 Array of the second image points of the same size and format as points1 . @param points2 Array of the second image points of the same size and format as points1 .
@param focal focal length of the camera. Note that this function assumes that points1 and points2 @param focal focal length of the camera. Note that this function assumes that points1 and points2
are feature points from cameras with same focal length and principle point. are feature points from cameras with same focal length and principal point.
@param pp principle point of the camera. @param pp principal point of the camera.
@param method Method for computing a fundamental matrix. @param method Method for computing a fundamental matrix.
- **RANSAC** for the RANSAC algorithm. - **RANSAC** for the RANSAC algorithm.
- **LMEDS** for the LMedS algorithm. - **LMEDS** for the LMedS algorithm.
...@@ -1403,8 +1403,8 @@ floating-point (single or double precision). ...@@ -1403,8 +1403,8 @@ floating-point (single or double precision).
@param R Recovered relative rotation. @param R Recovered relative rotation.
@param t Recoverd relative translation. @param t Recoverd relative translation.
@param focal Focal length of the camera. Note that this function assumes that points1 and points2 @param focal Focal length of the camera. Note that this function assumes that points1 and points2
are feature points from cameras with same focal length and principle point. are feature points from cameras with same focal length and principal point.
@param pp Principle point of the camera. @param pp principal point of the camera.
@param mask Input/output mask for inliers in points1 and points2. @param mask Input/output mask for inliers in points1 and points2.
: If it is not empty, then it marks inliers in points1 and points2 for then given essential : If it is not empty, then it marks inliers in points1 and points2 for then given essential
matrix E. Only these inliers will be used to recover pose. In the output mask only inliers matrix E. Only these inliers will be used to recover pose. In the output mask only inliers
......
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