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

#796, #1701 fixing doc vs code arg-s naming consistency

Browse Source
This commit is contained in:
Andrey Pavlenko 2012-03-30 14:22:34 +00:00
parent 38f686252c
commit aea24ffcd5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -392,11 +392,11 @@ that has
*O(N logN)* complexity in the current implementation. See the OpenCV sample ``convexhull.cpp`` that demonstrates the usage of different function variants. *O(N logN)* complexity in the current implementation. See the OpenCV sample ``convexhull.cpp`` that demonstrates the usage of different function variants.
ConvexityDefects convexityDefects
---------------- ----------------
Finds the convexity defects of a contour. Finds the convexity defects of a contour.
.. ocv:function:: void convexityDefects( InputArray points, InputArray convexhull, OutputArray convexityDefects ) .. ocv:function:: void convexityDefects( InputArray contour, InputArray convexhull, OutputArray convexityDefects )
.. ocv:pyfunction:: cv2.ConvexityDefects(contour, convexhull)-> convexityDefects .. ocv:pyfunction:: cv2.ConvexityDefects(contour, convexhull)-> convexityDefects

4
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
View File

@ -1030,9 +1030,9 @@ CV_EXPORTS_W double matchShapes( InputArray contour1, InputArray contour2,
CV_EXPORTS_W void convexHull( InputArray points, OutputArray hull, CV_EXPORTS_W void convexHull( InputArray points, OutputArray hull,
bool clockwise=false, bool returnPoints=true ); bool clockwise=false, bool returnPoints=true );
//! computes the contour convexity defects //! computes the contour convexity defects
CV_EXPORTS_W void convexityDefects( InputArray points, InputArray hull, OutputArray defects ); CV_EXPORTS_W void convexityDefects( InputArray contour, InputArray convexhull, OutputArray convexityDefects );
//! returns true iff the contour is convex. Does not support contours with self-intersection //! returns true if the contour is convex. Does not support contours with self-intersection
CV_EXPORTS_W bool isContourConvex( InputArray contour ); CV_EXPORTS_W bool isContourConvex( InputArray contour );
//! finds intersection of two convex polygons //! finds intersection of two convex polygons