Removed countNonZero call from CirclesGridClusterFinder::hierarchicalClustering

modules/calib3d/src/circlesgrid.cpp

@@ -53,6 +53,16 @@ using namespace std;
 void CirclesGridClusterFinder::hierarchicalClustering(const vector<Point2f> points, const Size &patternSize, vector<Point2f> &patternPoints)
 {
     int i, j, n = (int)points.size();
+    size_t pn = static_cast<size_t>(patternSize.area());
+
+    patternPoints.clear();
+    if (pn >= points.size())
+    {
+        if (pn == points.size())
+            patternPoints = points;
+        return;
+    }
+
     Mat dists(n, n, CV_32FC1, Scalar(0));
     Mat distsMask(dists.size(), CV_8UC1, Scalar(0));
     for(i = 0; i < n; i++)
@@ -74,7 +84,7 @@ void CirclesGridClusterFinder::hierarchicalClustering(const vector<Point2f> poin
     }
 
     int patternClusterIdx = 0;
-  while(clusters[patternClusterIdx].size() < static_cast<size_t>(patternSize.area()) && countNonZero(distsMask) > 0)
+    while(clusters[patternClusterIdx].size() < pn)
     {
         Point minLoc;
         minMaxLoc(dists, 0, 0, &minLoc, 0, distsMask);
@@ -83,22 +93,15 @@ void CirclesGridClusterFinder::hierarchicalClustering(const vector<Point2f> poin
 
         distsMask.row(maxIdx).setTo(0);
         distsMask.col(maxIdx).setTo(0);
-    Mat newDists = cv::min(dists.row(minLoc.x), dists.row(minLoc.y));
-    Mat tmpLine = dists.row(minIdx);
-    newDists.copyTo(tmpLine);
-    tmpLine = dists.col(minIdx);
-    newDists.copyTo(tmpLine);
+        Mat tmpRow = dists.row(minIdx);
+        Mat tmpCol = dists.col(minIdx);
+        cv::min(dists.row(minLoc.x), dists.row(minLoc.y), tmpRow);
+        tmpRow.copyTo(tmpCol);
 
         clusters[minIdx].splice(clusters[minIdx].end(), clusters[maxIdx]);
         patternClusterIdx = minIdx;
     }
 
-  patternPoints.clear();
-
-  if(clusters[patternClusterIdx].size() != static_cast<size_t>(patternSize.area()))
-  {
-    return;
-  }
     patternPoints.reserve(clusters[patternClusterIdx].size());
     for(std::list<size_t>::iterator it = clusters[patternClusterIdx].begin(); it != clusters[patternClusterIdx].end(); it++)
     {