generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed unnecessary comparison from CirclesGridClusterFinder::hierarchicalClustering

Browse Source
This commit is contained in:
Andrey Kamaev 2011-09-15 14:43:23 +00:00
parent 028c44531f
commit 6d56105b42
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/calib3d/src/circlesgrid.cpp
View File

@ -62,7 +62,7 @@ void CirclesGridClusterFinder::hierarchicalClustering(const vector<Point2f> poin
dists.at<float>(i, j) = (float)norm(points[i] - points[j]); dists.at<float>(i, j) = (float)norm(points[i] - points[j]);
distsMask.at<uchar>(i, j) = 255; distsMask.at<uchar>(i, j) = 255;
//TODO: use symmetry //TODO: use symmetry
distsMask.at<uchar>(j, i) = distsMask.at<uchar>(i, j); distsMask.at<uchar>(j, i) = 255;//distsMask.at<uchar>(i, j);
dists.at<float>(j, i) = dists.at<float>(i, j); dists.at<float>(j, i) = dists.at<float>(i, j);
} }
} }
@ -74,7 +74,7 @@ void CirclesGridClusterFinder::hierarchicalClustering(const vector<Point2f> poin
} }
int patternClusterIdx = 0; int patternClusterIdx = 0;
while(clusters[patternClusterIdx].size() < static_cast<size_t>(patternSize.area()) && countNonZero(distsMask == 255) > 0) while(clusters[patternClusterIdx].size() < static_cast<size_t>(patternSize.area()) && countNonZero(distsMask) > 0)
{ {
Point minLoc; Point minLoc;
minMaxLoc(dists, 0, 0, &minLoc, 0, distsMask); minMaxLoc(dists, 0, 0, &minLoc, 0, distsMask);