From 53f67de6a19e2efc419b9871b2621ea5db6b4df5 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Fri, 1 Jul 2011 21:33:41 +0000 Subject: [PATCH] fix displaying backprojectpatch picture, parameter description in planar subdivs; one more fix from Gabor --- modules/core/doc/old_basic_structures.rst | 4 ++-- modules/imgproc/doc/histograms.rst | 2 +- modules/imgproc/doc/planar_subdivisions.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/core/doc/old_basic_structures.rst b/modules/core/doc/old_basic_structures.rst index 9a75679c9e..ef742ce7e0 100644 --- a/modules/core/doc/old_basic_structures.rst +++ b/modules/core/doc/old_basic_structures.rst @@ -579,7 +579,7 @@ Copy ---- Copies one array to another. -.. cfunction:: void cvCopy(const CvArr* src, CvArr* dst, const CvArr* mask=NULL) +.. ocv:cfunction:: void cvCopy(const CvArr* src, CvArr* dst, const CvArr* mask=NULL) .. ocv:pyoldfunction:: cv.Copy(src, dst, mask=None)-> None :param src: The source array @@ -1635,7 +1635,7 @@ SetIPLAllocators ---------------- Makes OpenCV use IPL functions for allocating IplImage and IplROI structures. -.. cfunction:: void cvSetIPLAllocators( Cv_iplCreateImageHeader create_header, Cv_iplAllocateImageData allocate_data, Cv_iplDeallocate deallocate, Cv_iplCreateROI create_roi, Cv_iplCloneImage clone_image ) +.. ocv:cfunction:: void cvSetIPLAllocators( Cv_iplCreateImageHeader create_header, Cv_iplAllocateImageData allocate_data, Cv_iplDeallocate deallocate, Cv_iplCreateROI create_roi, Cv_iplCloneImage clone_image ) Normally, the function is not called directly. Instead, a simple macro ``CV_TURN_ON_IPL_COMPATIBILITY()`` is used that calls ``cvSetIPLAllocators`` and passes there pointers to IPL allocation functions. :: diff --git a/modules/imgproc/doc/histograms.rst b/modules/imgproc/doc/histograms.rst index f59bdd7d2e..12aa2dc3cf 100644 --- a/modules/imgproc/doc/histograms.rst +++ b/modules/imgproc/doc/histograms.rst @@ -315,7 +315,7 @@ Locates a template within an image by using a histogram comparison. :param factor: Normalization factor for histograms that affects the normalization scale of the destination image. Pass 1 if not sure. -The function calculates the back projection by comparing histograms of the source image patches with the given histogram. The function is similar to :ocv:func:`MatchTemplate`, but instead of comparing the raster patch with all its possible positions within the search window, the function ``CalcBackProjectPatch`` compares histograms. See the algorithm diagram below: :: +The function calculates the back projection by comparing histograms of the source image patches with the given histogram. The function is similar to :ocv:func:`MatchTemplate`, but instead of comparing the raster patch with all its possible positions within the search window, the function ``CalcBackProjectPatch`` compares histograms. See the algorithm diagram below: .. image:: pics/backprojectpatch.png diff --git a/modules/imgproc/doc/planar_subdivisions.rst b/modules/imgproc/doc/planar_subdivisions.rst index b1f301332b..2be890d6c5 100644 --- a/modules/imgproc/doc/planar_subdivisions.rst +++ b/modules/imgproc/doc/planar_subdivisions.rst @@ -252,7 +252,7 @@ Returns the location of a point within a Delaunay triangulation. :param pt: Point to locate. - :param edge: Output edge the point falls onto or right to. + :param edge: Output edge that the point belongs to or is located to the right of it. :param vertex: Optional output vertex double pointer the input point coinsides with.