Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv_contrib
Commits
1fec6079
Commit
1fec6079
authored
Aug 28, 2015
by
Pavel Rojtberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aruco: the nScales == 1 case is already handled inside parallel_for_
parent
4f860dcf
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
26 deletions
+0
-26
aruco.cpp
modules/aruco/src/aruco.cpp
+0
-26
No files found.
modules/aruco/src/aruco.cpp
View file @
1fec6079
...
...
@@ -315,31 +315,6 @@ static void _detectInitialCandidates(const Mat &grey, vector< vector< Point2f >
int
nScales
=
(
params
.
adaptiveThreshWinSizeMax
-
params
.
adaptiveThreshWinSizeMin
)
/
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
<
Point
>
>
>
contoursArrays
(
nScales
);
...
...
@@ -367,7 +342,6 @@ static void _detectInitialCandidates(const Mat &grey, vector< vector< Point2f >
contours
.
push_back
(
contoursArrays
[
i
][
j
]);
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment