Merge pull request #657 from prclibo:master

0990b42e · Vadim Pisarevsky · OpenCV Buildbot · 219bdb98 · 94b12eae · 0990b42e
Commit 0990b42e authored Mar 21, 2013 by Vadim Pisarevsky Committed by OpenCV Buildbot Mar 21, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

camera_calibration_and_3d_reconstruction.rst .../calib3d/doc/camera_calibration_and_3d_reconstruction.rst +1 -1

five-point.cpp modules/calib3d/src/five-point.cpp +0 -0

No files found.
--- a/modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
+++ b/modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
@@ -715,7 +715,7 @@ Calculates an essential matrix from the corresponding points in two images.

    :param mask: Output array of N elements, every element of which is set to 0 for outliers and to 1 for the other points. The array is computed only in the RANSAC and LMedS methods.

-This function estimates essential matrix based on an implementation of five-point algorithm [Nister03]_ [SteweniusCFS]_.
+This function estimates essential matrix based on the five-point algorithm solver in [Nister03]_. [SteweniusCFS]_ is also a related.
 The epipolar geometry is described by the following equation:

 .. math::

--- a/modules/calib3d/src/five-point.cpp
+++ b/modules/calib3d/src/five-point.cpp