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

Merge https://github.com/Itseez/opencv

Browse Source
This commit is contained in:
Nghia Ho
2013-07-30 23:58:10 +10:00
parent cb16f733b9 93923141d5
commit 3fcdbbe734
25 changed files with 778 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ The output of the function can be used for robust edge or corner detection.
cornerHarris
------------
Harris edge detector.
Harris corner detector.
.. ocv:function:: void cornerHarris( InputArray src, OutputArray dst, int blockSize, int ksize, double k, int borderType=BORDER_DEFAULT )
@@ -105,7 +105,7 @@ Harris edge detector.
:param borderType: Pixel extrapolation method. See :ocv:func:`borderInterpolate` .
The function runs the Harris edge detector on the image. Similarly to
The function runs the Harris corner detector on the image. Similarly to
:ocv:func:`cornerMinEigenVal` and
:ocv:func:`cornerEigenValsAndVecs` , for each pixel
:math:`(x, y)` it calculates a

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

@@ -863,7 +863,7 @@ public:
* * 1 corresponds to 0.1 mean false alarms
* This vector will be calculated _only_ when the objects type is REFINE_ADV
*/
virtual void detect(const InputArray _image, OutputArray _lines,
virtual void detect(InputArray _image, OutputArray _lines,
OutputArray width = noArray(), OutputArray prec = noArray(),
OutputArray nfa = noArray()) = 0;
@@ -874,7 +874,7 @@ public:
* Should have the size of the image, where the lines were found
* @param lines The lines that need to be drawn
*/
virtual void drawSegments(InputOutputArray image, const InputArray lines) = 0;
virtual void drawSegments(InputOutputArray image, InputArray lines) = 0;
/**
* Draw both vectors on the image canvas. Uses blue for lines 1 and red for lines 2.
@@ -885,7 +885,7 @@ public:
* @param lines2 The second lines that need to be drawn. Color - Red.
* @return The number of mismatching pixels between lines1 and lines2.
*/
virtual int compareSegments(const Size& size, const InputArray lines1, const InputArray lines2, Mat* image = 0) = 0;
virtual int compareSegments(const Size& size, InputArray lines1, InputArray lines2, Mat* image = 0) = 0;
virtual ~LineSegmentDetector() {};
};

6
modules/imgproc/src/lsd.cpp
View File

@@ -205,7 +205,7 @@ public:
* * 1 corresponds to 0.1 mean false alarms
* This vector will be calculated _only_ when the objects type is REFINE_ADV
*/
void detect(const InputArray _image, OutputArray _lines,
void detect(InputArray _image, OutputArray _lines,
OutputArray width = noArray(), OutputArray prec = noArray(),
OutputArray nfa = noArray());
@@ -216,7 +216,7 @@ public:
* Should have the size of the image, where the lines were found
* @param lines The lines that need to be drawn
*/
void drawSegments(InputOutputArray image, const InputArray lines);
void drawSegments(InputOutputArray image, InputArray lines);
/**
* Draw both vectors on the image canvas. Uses blue for lines 1 and red for lines 2.
@@ -227,7 +227,7 @@ public:
* @param lines2 The second lines that need to be drawn. Color - Red.
* @return The number of mismatching pixels between lines1 and lines2.
*/
int compareSegments(const Size& size, const InputArray lines1, const InputArray lines2, Mat* image = 0);
int compareSegments(const Size& size, InputArray lines1, InputArray lines2, Mat* image = 0);
private:
Mat image;