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

Merge pull request #2898 from PhilLab:2.4

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-07-18 09:26:49 +00:00
parent 0b4e043442 d5489f3a68
commit 39020fc9cf
13 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,7 @@ public:
BaseRowFilter();
//! the destructor
virtual ~BaseRowFilter();
//! the filtering operator. Must be overrided in the derived classes. The horizontal border interpolation is done outside of the class.
//! the filtering operator. Must be overridden in the derived classes. The horizontal border interpolation is done outside of the class.
virtual void operator()(const uchar* src, uchar* dst,
int width, int cn) = 0;
int ksize, anchor;
@@ -111,7 +111,7 @@ public:
BaseColumnFilter();
//! the destructor
virtual ~BaseColumnFilter();
//! the filtering operator. Must be overrided in the derived classes. The vertical border interpolation is done outside of the class.
//! the filtering operator. Must be overridden in the derived classes. The vertical border interpolation is done outside of the class.
virtual void operator()(const uchar** src, uchar* dst, int dststep,
int dstcount, int width) = 0;
//! resets the internal buffers, if any

8
modules/imgproc/src/contours.cpp
View File

@@ -125,7 +125,7 @@ _CvContourInfo;
/*
Structure that is used for sequental retrieving contours from the image.
Structure that is used for sequential retrieving contours from the image.
It supports both hierarchical and plane variants of Suzuki algorithm.
*/
typedef struct _CvContourScanner
@@ -314,7 +314,7 @@ cvStartFindContours( void* _img, CvMemStorage* storage,
tree. The retrieved contour itself is removed from the storage.
Here two cases are possible:
2a. If one deals with plane variant of algorithm
(hierarchical strucutre is not reconstructed),
(hierarchical structure is not reconstructed),
the contour is removed completely.
2b. In hierarchical case, the header of the contour is not removed.
It's marked as "link to contour" and h_next pointer of it is set to
@@ -326,8 +326,8 @@ cvStartFindContours( void* _img, CvMemStorage* storage,
leaves header if hierarchical (but doesn't mark header as "link").
------------------------------------------------------------------------
The 1st variant can be used to retrieve and store all the contours from the image
(with optional convertion from chains to contours using some approximation from
restriced set of methods). Some characteristics of contour can be computed in the
(with optional conversion from chains to contours using some approximation from
restricted set of methods). Some characteristics of contour can be computed in the
same pass.
The usage scheme can look like: