EdgeDrawing: Use getter for segment index

Author: ToFam

modules/ximgproc/include/opencv2/ximgproc/edge_drawing.hpp

@@ -67,15 +67,20 @@ class CV_EXPORTS_W EdgeDrawing : public Algorithm
     CV_WRAP virtual void getEdgeImage(OutputArray dst) = 0;
     CV_WRAP virtual void getGradientImage(OutputArray dst) = 0;
 
+    /** @brief Returns std::vector<std::vector<Point>> of detected edge segments, see detectEdges()
+     */
     CV_WRAP virtual std::vector<std::vector<Point> > getSegments() = 0;
 
+    /** @brief Returns for each line found in detectLines() its edge segment index in getSegments()
+     */
+    CV_WRAP virtual std::vector<int> getSegmentIndicesOfLines() const = 0;
+
     /** @brief Detects lines.
 
     @param lines  output Vec<4f> contains start point and end point of detected lines.
-    @param segments  output vector containing the edge segment index for each line, see getSegments()
     @note you should call detectEdges() method before call this.
     */
-    CV_WRAP virtual void detectLines(OutputArray lines, OutputArray segments = cv::noArray()) = 0;
+    CV_WRAP virtual void detectLines(OutputArray lines) = 0;
 
     /** @brief Detects circles and ellipses.
 

modules/ximgproc/src/edge_drawing.cpp

@@ -109,7 +109,8 @@ class EdgeDrawingImpl : public EdgeDrawing
     void getGradientImage(OutputArray dst) CV_OVERRIDE;
 
     vector<vector<Point> > getSegments() CV_OVERRIDE;
-    void detectLines(OutputArray lines, OutputArray segments = cv::noArray()) CV_OVERRIDE;
+    vector<int> getSegmentIndicesOfLines() const CV_OVERRIDE;
+    void detectLines(OutputArray lines) CV_OVERRIDE;
     void detectEllipses(OutputArray ellipses) CV_OVERRIDE;
 
     virtual void read(const FileNode& fn) CV_OVERRIDE;
@@ -120,6 +121,7 @@ class EdgeDrawingImpl : public EdgeDrawing
     int height;       // height of source image
     uchar *srcImg;
     vector<vector<Point> > segmentPoints;
+    vector<int> segmentIndicesOfLines;
     Mat smoothImage;
     uchar *edgeImg;   // pointer to edge image data
     uchar *smoothImg; // pointer to smoothed image data
@@ -440,6 +442,11 @@ std::vector<std::vector<Point> > EdgeDrawingImpl::getSegments()
     return segmentPoints;
 }
 
+std::vector<int> EdgeDrawingImpl::getSegmentIndicesOfLines() const
+{
+    return segmentIndicesOfLines;
+}
+
 void EdgeDrawingImpl::ComputeGradient()
 {
     for (int j = 0; j < width; j++)
@@ -1263,7 +1270,7 @@ int EdgeDrawingImpl::RetrieveChainNos(Chain* chains, int root, int chainNos[])
     return count;
 }
 
-void EdgeDrawingImpl::detectLines(OutputArray _lines, OutputArray _lineSegments)
+void EdgeDrawingImpl::detectLines(OutputArray _lines)
 {
     std::vector<Vec4f> linePoints;
     if (segmentPoints.size() < 1)
@@ -1312,18 +1319,14 @@ void EdgeDrawingImpl::detectLines(OutputArray _lines, OutputArray _lineSegments)
     for (int i = 1; i <= size - linesNo; i++)
         lines.pop_back();
 
-    std::vector<int> lineSegmentIndices;
+    segmentIndicesOfLines.clear();
     for (int i = 0; i < linesNo; i++)
     {
         Vec4f line((float)lines[i].sx, (float)lines[i].sy, (float)lines[i].ex, (float)lines[i].ey);
         linePoints.push_back(line);
-        lineSegmentIndices.push_back(lines[i].segmentNo);
+        segmentIndicesOfLines.push_back(lines[i].segmentNo);
     }
     Mat(linePoints).copyTo(_lines);
-    if (_lineSegments.needed())
-    {
-        Mat(lineSegmentIndices).copyTo(_lineSegments);
-    }
 
     delete[] x;
     delete[] y;