Commit 1fec6079 authored by Pavel Rojtberg's avatar Pavel Rojtberg

aruco: the nScales == 1 case is already handled inside parallel_for_

parent 4f860dcf
...@@ -315,31 +315,6 @@ static void _detectInitialCandidates(const Mat &grey, vector< vector< Point2f > ...@@ -315,31 +315,6 @@ static void _detectInitialCandidates(const Mat &grey, vector< vector< Point2f >
int nScales = (params.adaptiveThreshWinSizeMax - params.adaptiveThreshWinSizeMin) / int nScales = (params.adaptiveThreshWinSizeMax - params.adaptiveThreshWinSizeMin) /
params.adaptiveThreshWinSizeStep + 1; params.adaptiveThreshWinSizeStep + 1;
// if only one scale
if(nScales == 1) {
int scale = params.adaptiveThreshWinSizeMin;
// treshold
Mat thresh;
_threshold(grey, thresh, scale, params.adaptiveThreshConstant);
// detect rectangles
vector< vector< Point2f > > currentCandidates;
vector< vector< Point > > currentContours;
_findMarkerContours(thresh, currentCandidates, currentContours,
params.minMarkerPerimeterRate, params.maxMarkerPerimeterRate,
params.polygonalApproxAccuracyRate, params.minCornerDistanceRate,
params.minDistanceToBorder);
// join candidates
for(unsigned int i = 0; i < currentCandidates.size(); i++) {
candidates.push_back(currentCandidates[i]);
contours.push_back(currentContours[i]);
}
}
// if more than one scale, do it in parallel
else {
vector< vector< vector< Point2f > > > candidatesArrays(nScales); vector< vector< vector< Point2f > > > candidatesArrays(nScales);
vector< vector< vector< Point > > > contoursArrays(nScales); vector< vector< vector< Point > > > contoursArrays(nScales);
...@@ -367,7 +342,6 @@ static void _detectInitialCandidates(const Mat &grey, vector< vector< Point2f > ...@@ -367,7 +342,6 @@ static void _detectInitialCandidates(const Mat &grey, vector< vector< Point2f >
contours.push_back(contoursArrays[i][j]); contours.push_back(contoursArrays[i][j]);
} }
} }
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment