generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
edgarriba
2014-10-06 23:46:30 +02:00
parent 2494e028c0 478dd01c91
commit f317d1277f
101 changed files with 12882 additions and 6397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
View File

@@ -580,7 +580,7 @@ Finds an object pose from 3D-2D point correspondences.
:param tvec: Output translation vector.
:param useExtrinsicGuess: Parameter used for ITERATIVE. If true (1), the function uses the provided ``rvec`` and ``tvec`` values as initial approximations of the rotation and translation vectors, respectively, and further optimizes them.
:param useExtrinsicGuess: Parameter used for SOLVEPNP_ITERATIVE. If true (1), the function uses the provided ``rvec`` and ``tvec`` values as initial approximations of the rotation and translation vectors, respectively, and further optimizes them.
:param flags: Method for solving a PnP problem:
@@ -616,7 +616,7 @@ Finds an object pose from 3D-2D point correspondences using the RANSAC scheme.
:param tvec: Output translation vector.
:param useExtrinsicGuess: Parameter used for ITERATIVE. If true (1), the function uses the provided ``rvec`` and ``tvec`` values as initial approximations of the rotation and translation vectors, respectively, and further optimizes them.
:param useExtrinsicGuess: Parameter used for SOLVEPNP_ITERATIVE. If true (1), the function uses the provided ``rvec`` and ``tvec`` values as initial approximations of the rotation and translation vectors, respectively, and further optimizes them.
:param iterationsCount: Number of iterations.