Merge branch 4.x

Author: asmorkalov

modules/fastcv/include/opencv2/fastcv/tracking.hpp

@@ -29,13 +29,12 @@ namespace fastcv {
  * @param winSize Size of window for optical flow searching. Width and height ust be odd numbers. Suggested values are 5, 7 or 9
  * @param termCriteria Termination criteria containing max number of iterations, max epsilon and stop condition
  */
-void trackOpticalFlowLK(InputArray src, InputArray dst,
-                        InputArrayOfArrays srcPyr, InputArrayOfArrays dstPyr,
-                        InputArray ptsIn, OutputArray ptsOut, InputArray ptsEst,
-                        OutputArray statusVec, cv::Size winSize = {7, 7},
-                        cv::TermCriteria termCriteria = {cv::TermCriteria::MAX_ITER | cv::TermCriteria::EPS,
-                                                         /* maxIterations */ 7,
-                                                         /* maxEpsilon */ 0.03f * 0.03f});
+CV_EXPORTS_W void trackOpticalFlowLK(InputArray src, InputArray dst,
+                                     InputArrayOfArrays srcPyr, InputArrayOfArrays dstPyr,
+                                     InputArray ptsIn, OutputArray ptsOut, InputArray ptsEst,
+                                     OutputArray statusVec, cv::Size winSize = cv::Size(7, 7),
+                                     cv::TermCriteria termCriteria = cv::TermCriteria(cv::TermCriteria::MAX_ITER | cv::TermCriteria::EPS,
+                                                                                      /* maxIterations */ 7, /* maxEpsilon */ 0.03f * 0.03f));
 
 /**
  * @brief Overload for v1 of the LK tracking function
@@ -52,11 +51,11 @@ void trackOpticalFlowLK(InputArray src, InputArray dst,
  * @param winSize Size of window for optical flow searching. Width and height ust be odd numbers. Suggested values are 5, 7 or 9
  * @param maxIterations Maximum number of iterations to try
  */
-void trackOpticalFlowLK(InputArray src, InputArray dst,
-                        InputArrayOfArrays srcPyr, InputArrayOfArrays dstPyr,
-                        InputArrayOfArrays srcDxPyr, InputArrayOfArrays srcDyPyr,
-                        InputArray ptsIn, OutputArray ptsOut,
-                        OutputArray statusVec, cv::Size winSize = {7, 7}, int maxIterations = 7);
+CV_EXPORTS_W void trackOpticalFlowLK(InputArray src, InputArray dst,
+                                     InputArrayOfArrays srcPyr, InputArrayOfArrays dstPyr,
+                                     InputArrayOfArrays srcDxPyr, InputArrayOfArrays srcDyPyr,
+                                     InputArray ptsIn, OutputArray ptsOut,
+                                     OutputArray statusVec, cv::Size winSize = cv::Size(7, 7), int maxIterations = 7);
 
 //! @}
 

modules/fastcv/perf/perf_hough.cpp

@@ -21,7 +21,7 @@ PERF_TEST_P(HoughLinesPerfTest, run,
 {
     auto p = GetParam();
     std::string fname = std::get<0>(p);
-    double threshold  = std::get<1>(p);
+    double thrld  = std::get<1>(p);
 
     cv::Mat src = imread(cvtest::findDataFile(fname), cv::IMREAD_GRAYSCALE);
     // make it aligned by 8
@@ -34,7 +34,7 @@ PERF_TEST_P(HoughLinesPerfTest, run,
     {
         std::vector<cv::Vec4f> lines;
         startTimer();
-        cv::fastcv::houghLines(src, lines, threshold);
+        cv::fastcv::houghLines(src, lines, thrld);
         stopTimer();
     }
 

modules/fastcv/test/test_mser.cpp

@@ -81,12 +81,12 @@ TEST_P(MSERTest, accuracy)
     // find pair of contours by similar moments
     typedef cv::Matx<double, 10, 1> MomentVec;
 
-    auto calcEstimate = [](const std::vector<std::vector<Point>>& contours, Size srcSize) -> std::vector<std::pair<Mat, MomentVec>>
+    auto calcEstimate = [](const std::vector<std::vector<Point>>& ctrs, Size srcSize) -> std::vector<std::pair<Mat, MomentVec>>
     {
         std::vector<std::pair<Mat, MomentVec>> res;
-        for (size_t i = 0; i < contours.size(); i++)
+        for (size_t i = 0; i < ctrs.size(); i++)
         {
-            const std::vector<Point>& contour = contours[i];
+            const std::vector<Point>& contour = ctrs[i];
             Mat ptsMap(srcSize, CV_8U, Scalar(255));
             for(size_t j = 0; j < contour.size(); ++j)
             {