mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 05:29:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed IOArray constness.

Browse Source
This commit is contained in:
Daniel Angelov 2013-09-04 14:59:57 +03:00
parent 24e916059f
commit b5e1eb7d48
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -579,7 +579,7 @@ LineSegmentDetector::drawSegments
--------------------------------- ---------------------------------
Draws the line segments on a given image. Draws the line segments on a given image.
.. ocv:function:: void LineSegmentDetector::drawSegments(InputOutputArray _image, const InputArray lines) .. ocv:function:: void LineSegmentDetector::drawSegments(InputOutputArray _image, InputArray lines)
:param image: The image, where the liens will be drawn. Should be bigger or equal to the image, where the lines were found. :param image: The image, where the liens will be drawn. Should be bigger or equal to the image, where the lines were found.
@ -590,7 +590,7 @@ LineSegmentDetector::compareSegments
------------------------------------ ------------------------------------
Draws two groups of lines in blue and red, counting the non overlapping (mismatching) pixels. Draws two groups of lines in blue and red, counting the non overlapping (mismatching) pixels.
.. ocv:function:: int LineSegmentDetector::compareSegments(const Size& size, const InputArray lines1, const InputArray lines2, InputOutputArray _image = noArray()) .. ocv:function:: int LineSegmentDetector::compareSegments(const Size& size, InputArray lines1, InputArray lines2, InputOutputArray _image = noArray())
:param size: The size of the image, where lines1 and lines2 were found. :param size: The size of the image, where lines1 and lines2 were found.

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

@ -933,7 +933,7 @@ public:
* Should have the size of the image, where the lines were found * Should have the size of the image, where the lines were found
* @param lines The lines that need to be drawn * @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. * Draw both vectors on the image canvas. Uses blue for lines 1 and red for lines 2.
@ -945,7 +945,7 @@ public:
* Should have the size of the image, where the lines were found * Should have the size of the image, where the lines were found
* @return The number of mismatching pixels between lines1 and lines2. * @return The number of mismatching pixels between lines1 and lines2.
*/ */
virtual int compareSegments(const Size& size, const InputArray lines1, const InputArray lines2, InputOutputArray _image = noArray()) = 0; virtual int compareSegments(const Size& size, InputArray lines1, InputArray lines2, InputOutputArray _image = noArray()) = 0;
virtual ~LineSegmentDetector() {}; virtual ~LineSegmentDetector() {};
}; };

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

@ -214,7 +214,7 @@ public:
* Should have the size of the image, where the lines were found * Should have the size of the image, where the lines were found
* @param lines The lines that need to be drawn * @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. * Draw both vectors on the image canvas. Uses blue for lines 1 and red for lines 2.
@ -226,7 +226,7 @@ public:
* Should have the size of the image, where the lines were found * Should have the size of the image, where the lines were found
* @return The number of mismatching pixels between lines1 and lines2. * @return The number of mismatching pixels between lines1 and lines2.
*/ */
int compareSegments(const Size& size, const InputArray lines1, const InputArray lines2, InputOutputArray _image = noArray()); int compareSegments(const Size& size, InputArray lines1, InputArray lines2, InputOutputArray _image = noArray());
private: private:
Mat image; Mat image;
@ -335,7 +335,7 @@ private:
* @param rec Return: The generated rectangle. * @param rec Return: The generated rectangle.
*/ */
void region2rect(const std::vector<RegionPoint>& reg, const int reg_size, const double reg_angle, void region2rect(const std::vector<RegionPoint>& reg, const int reg_size, const double reg_angle,
const double prec, const double p, rect& rec) const; const double prec, const double p, rect& rec) const;
/** /**
* Compute region's angle as the principal inertia axis of the region. * Compute region's angle as the principal inertia axis of the region.
@ -409,7 +409,7 @@ LineSegmentDetectorImpl::LineSegmentDetectorImpl(int _refine, double _scale, dou
_n_bins > 0); _n_bins > 0);
} }
void LineSegmentDetectorImpl::detect(const InputArray _image, OutputArray _lines, void LineSegmentDetectorImpl::detect(InputArray _image, OutputArray _lines,
OutputArray _width, OutputArray _prec, OutputArray _nfa) OutputArray _width, OutputArray _prec, OutputArray _nfa)
{ {
Mat_<double> img = _image.getMat(); Mat_<double> img = _image.getMat();
@ -1149,7 +1149,7 @@ inline bool LineSegmentDetectorImpl::isAligned(const int& address, const double&
} }
void LineSegmentDetectorImpl::drawSegments(InputOutputArray _image, const InputArray lines) void LineSegmentDetectorImpl::drawSegments(InputOutputArray _image, InputArray lines)
{ {
CV_Assert(!_image.empty() && (_image.channels() == 1 || _image.channels() == 3)); CV_Assert(!_image.empty() && (_image.channels() == 1 || _image.channels() == 3));
@ -1185,7 +1185,7 @@ void LineSegmentDetectorImpl::drawSegments(InputOutputArray _image, const InputA
} }
int LineSegmentDetectorImpl::compareSegments(const Size& size, const InputArray lines1, const InputArray lines2, InputOutputArray _image) int LineSegmentDetectorImpl::compareSegments(const Size& size, InputArray lines1, InputArray lines2, InputOutputArray _image)
{ {
Size sz = size; Size sz = size;
if (_image.needed() && _image.size() != size) sz = _image.size(); if (_image.needed() && _image.size() != size) sz = _image.size();