Merge branch 4.x

Author: asmorkalov

modules/cudafeatures2d/src/brute_force_matcher.cpp

@@ -791,15 +791,13 @@ namespace
             for (int i = 0; i < k; ++i)
             {
                 const int trainIdx = *trainIdxPtr;
-                if (trainIdx == -1)
-                    continue;
-
-                const int imgIdx = imgIdxPtr ? *imgIdxPtr : 0;
-                const float distance = *distancePtr;
-
-                DMatch m(queryIdx, trainIdx, imgIdx, distance);
-
-                curMatches.push_back(m);
+                if (trainIdx != -1)
+                {
+                    const int imgIdx = imgIdxPtr ? *imgIdxPtr : 0;
+                    const float distance = *distancePtr;
+                    DMatch m(queryIdx, trainIdx, imgIdx, distance);
+                    curMatches.push_back(m);
+                }
 
                 ++trainIdxPtr;
                 ++distancePtr;

modules/cudaimgproc/include/opencv2/cudaimgproc.hpp

@@ -578,6 +578,9 @@ class CV_EXPORTS_W CornersDetector : public Algorithm
     @param stream Stream for the asynchronous version.
      */
     CV_WRAP virtual void detect(InputArray image, OutputArray corners, InputArray mask = noArray(), Stream& stream = Stream::Null()) = 0;
+
+    CV_WRAP virtual void setMaxCorners(int maxCorners) = 0;
+    CV_WRAP virtual void setMinDistance(double minDistance) = 0;
 };
 
 /** @brief Creates implementation for cuda::CornersDetector .

modules/cudaimgproc/src/gftt.cpp

@@ -69,7 +69,8 @@ namespace
                                     int blockSize, bool useHarrisDetector, double harrisK);
         ~GoodFeaturesToTrackDetector();
         void detect(InputArray image, OutputArray corners, InputArray mask, Stream& stream);
-
+        void setMaxCorners(int maxCorners) CV_OVERRIDE { maxCorners_ = maxCorners; }
+        void setMinDistance(double minDistance) CV_OVERRIDE { minDistance_ = minDistance; }
     private:
         int maxCorners_;
         double qualityLevel_;

modules/ximgproc/src/edge_drawing.cpp

@@ -1366,7 +1366,7 @@ void EdgeDrawingImpl::SplitSegment2Lines(double* x, double* y, int noPixels, int
     {
         // Start by fitting a line to MIN_LINE_LEN pixels
         bool valid = false;
-        double lastA(0), lastB(0), error;
+        double lastA(0), lastB(0), error(0);
         int lastInvert(0);
 
         while (noPixels >= min_line_len)