Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 1f63b98

Browse filesBrowse files
authored
Merge pull request opencv#26976 from MaximSmolskiy/refactor-ArucoDetector-ArucoDetectorImpl-filterTooCloseCandidates
Refactor ArucoDetector::ArucoDetectorImpl::filterTooCloseCandidates
2 parents a48e78c + 63ad15c commit 1f63b98
Copy full SHA for 1f63b98

File tree

Expand file treeCollapse file tree

1 file changed

+8
-4
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+8
-4
lines changed

‎modules/objdetect/src/aruco/aruco_detector.cpp

Copy file name to clipboardExpand all lines: modules/objdetect/src/aruco/aruco_detector.cpp
+8-4Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,6 @@ struct ArucoDetector::ArucoDetectorImpl {
892892
vector<vector<size_t> > groupedCandidates;
893893
vector<bool> isSelectedContours(candidateTree.size(), true);
894894

895-
size_t countSelectedContours = 0ull;
896895
for (size_t i = 0ull; i < candidateTree.size(); i++) {
897896
for (size_t j = i + 1ull; j < candidateTree.size(); j++) {
898897
float minDist = getAverageDistance(candidateTree[i].corners, candidateTree[j].corners);
@@ -925,7 +924,12 @@ struct ArucoDetector::ArucoDetectorImpl {
925924
}
926925
}
927926
}
928-
countSelectedContours += isSelectedContours[i];
927+
// group of one candidate
928+
if(isSelectedContours[i]) {
929+
isSelectedContours[i] = false;
930+
groupId[i] = (int)groupedCandidates.size();
931+
groupedCandidates.push_back({i});
932+
}
929933
}
930934

931935
for (vector<size_t>& grouped : groupedCandidates) {
@@ -948,8 +952,8 @@ struct ArucoDetector::ArucoDetectorImpl {
948952
}
949953
}
950954

951-
vector<MarkerCandidateTree> selectedCandidates(countSelectedContours + groupedCandidates.size());
952-
countSelectedContours = 0ull;
955+
vector<MarkerCandidateTree> selectedCandidates(groupedCandidates.size());
956+
size_t countSelectedContours = 0ull;
953957
for (size_t i = 0ull; i < candidateTree.size(); i++) {
954958
if (isSelectedContours[i]) {
955959
selectedCandidates[countSelectedContours] = std::move(candidateTree[i]);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.