From aea24ffcd5120216881528fed3b0a8886d3d5c2b Mon Sep 17 00:00:00 2001 From: Andrey Pavlenko Date: Fri, 30 Mar 2012 14:22:34 +0000 Subject: [PATCH] #796, #1701 fixing doc vs code arg-s naming consistency --- modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst | 4 ++-- modules/imgproc/include/opencv2/imgproc/imgproc.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst b/modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst index acd6cbc..84f80a3 100644 --- a/modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst +++ b/modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst @@ -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. -ConvexityDefects +convexityDefects ---------------- 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 diff --git a/modules/imgproc/include/opencv2/imgproc/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc/imgproc.hpp index 0cc8bbe..b2e1ea8 100644 --- a/modules/imgproc/include/opencv2/imgproc/imgproc.hpp +++ b/modules/imgproc/include/opencv2/imgproc/imgproc.hpp @@ -1030,9 +1030,9 @@ CV_EXPORTS_W double matchShapes( InputArray contour1, InputArray contour2, CV_EXPORTS_W void convexHull( InputArray points, OutputArray hull, bool clockwise=false, bool returnPoints=true ); //! 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 ); //! finds intersection of two convex polygons -- 2.7.4