mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 05:06:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1538 from StevenPuttemans:bugfix_3283

Browse Source
This commit is contained in:
Roman Donchenko 2013-10-08 13:00:38 +04:00 committed by OpenCV Buildbot
commit 895308a811
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/doc/drawing_functions.rst
View File

@ -106,7 +106,7 @@ Draws a simple or thick elliptic arc or fills an ellipse sector.
:param center: Center of the ellipse.
:param axes: Length of the ellipse axes.
:param axes: Half of the size of the ellipse main axes.
:param angle: Ellipse rotation angle in degrees.
@ -144,7 +144,7 @@ Approximates an elliptic arc with a polyline.
:param center: Center of the arc.
:param axes: Half-sizes of the arc. See the :ocv:func:`ellipse` for details.
:param axes: Half of the size of the ellipse main axes. See the :ocv:func:`ellipse` for details.
:param angle: Rotation angle of the ellipse in degrees. See the :ocv:func:`ellipse` for details.
@ -160,7 +160,6 @@ The function ``ellipse2Poly`` computes the vertices of a polyline that approxima
:ocv:func:`ellipse` .
fillConvexPoly
------------------
Fills a convex polygon.

5
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
View File

@ -358,8 +358,6 @@ Calculates the up-right bounding rectangle of a point set.
The function calculates and returns the minimal up-right bounding rectangle for the specified point set.
contourArea
---------------
Calculates a contour area.
@ -489,6 +487,7 @@ Fits an ellipse around a set of 2D points.
* Nx2 numpy array (Python interface)
The function calculates the ellipse that fits (in a least-squares sense) a set of 2D points best of all. It returns the rotated rectangle in which the ellipse is inscribed. The algorithm [Fitzgibbon95]_ is used.
Developer should keep in mind that it is possible that the returned ellipse/rotatedRect data contains negative indices, due to the data points being close to the border of the containing Mat element.
.. note::
@ -614,7 +613,7 @@ Finds a rotated rectangle of the minimum area enclosing the input 2D point set.
* Nx2 numpy array (Python interface)
The function calculates and returns the minimum-area bounding rectangle (possibly rotated) for a specified point set. See the OpenCV sample ``minarea.cpp`` .
Developer should keep in mind that the returned rotatedRect can contain negative indices when data is close the the containing Mat element boundary.
minEnclosingCircle