From b5e1eb7d48f2aa4d0b2347f3d24c0ea90ac943ff Mon Sep 17 00:00:00 2001 From: Daniel Angelov Date: Wed, 4 Sep 2013 14:59:57 +0300 Subject: [PATCH] Removed IOArray constness. --- modules/imgproc/doc/feature_detection.rst | 4 ++-- modules/imgproc/include/opencv2/imgproc.hpp | 4 ++-- modules/imgproc/src/lsd.cpp | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/imgproc/doc/feature_detection.rst b/modules/imgproc/doc/feature_detection.rst index b23675171b..ef44c05c35 100644 --- a/modules/imgproc/doc/feature_detection.rst +++ b/modules/imgproc/doc/feature_detection.rst @@ -579,7 +579,7 @@ LineSegmentDetector::drawSegments --------------------------------- 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. @@ -590,7 +590,7 @@ LineSegmentDetector::compareSegments ------------------------------------ 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. diff --git a/modules/imgproc/include/opencv2/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc.hpp index 581ba14432..76d5002489 100644 --- a/modules/imgproc/include/opencv2/imgproc.hpp +++ b/modules/imgproc/include/opencv2/imgproc.hpp @@ -933,7 +933,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. @@ -945,7 +945,7 @@ public: * Should have the size of the image, where the lines were found * @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() {}; }; diff --git a/modules/imgproc/src/lsd.cpp b/modules/imgproc/src/lsd.cpp index 8cfe2b2b21..9b57a34115 100644 --- a/modules/imgproc/src/lsd.cpp +++ b/modules/imgproc/src/lsd.cpp @@ -214,7 +214,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. @@ -226,7 +226,7 @@ public: * Should have the size of the image, where the lines were found * @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: Mat image; @@ -335,7 +335,7 @@ private: * @param rec Return: The generated rectangle. */ void region2rect(const std::vector& 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. @@ -409,7 +409,7 @@ LineSegmentDetectorImpl::LineSegmentDetectorImpl(int _refine, double _scale, dou _n_bins > 0); } -void LineSegmentDetectorImpl::detect(const InputArray _image, OutputArray _lines, +void LineSegmentDetectorImpl::detect(InputArray _image, OutputArray _lines, OutputArray _width, OutputArray _prec, OutputArray _nfa) { Mat_ 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)); @@ -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; if (_image.needed() && _image.size() != size) sz = _image.size();