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
f730de1a
Commit
f730de1a
authored
Mar 21, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aruco: apply CV_OVERRIDE/CV_FINAL
parent
2888fea1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
aruco.cpp
modules/aruco/src/aruco.cpp
+5
-5
charuco.cpp
modules/aruco/src/charuco.cpp
+1
-1
No files found.
modules/aruco/src/aruco.cpp
View file @
f730de1a
...
...
@@ -293,7 +293,7 @@ class DetectInitialCandidatesParallel : public ParallelLoopBody {
:
grey
(
_grey
),
candidatesArrays
(
_candidatesArrays
),
contoursArrays
(
_contoursArrays
),
params
(
_params
)
{}
void
operator
()(
const
Range
&
range
)
const
{
void
operator
()(
const
Range
&
range
)
const
CV_OVERRIDE
{
const
int
begin
=
range
.
start
;
const
int
end
=
range
.
end
;
...
...
@@ -547,7 +547,7 @@ class IdentifyCandidatesParallel : public ParallelLoopBody {
:
grey
(
_grey
),
candidates
(
_candidates
),
dictionary
(
_dictionary
),
idsTmp
(
_idsTmp
),
validCandidates
(
_validCandidates
),
params
(
_params
)
{}
void
operator
()(
const
Range
&
range
)
const
{
void
operator
()(
const
Range
&
range
)
const
CV_OVERRIDE
{
const
int
begin
=
range
.
start
;
const
int
end
=
range
.
end
;
...
...
@@ -773,7 +773,7 @@ class MarkerSubpixelParallel : public ParallelLoopBody {
const
Ptr
<
DetectorParameters
>
&
_params
)
:
grey
(
_grey
),
corners
(
_corners
),
params
(
_params
)
{}
void
operator
()(
const
Range
&
range
)
const
{
void
operator
()(
const
Range
&
range
)
const
CV_OVERRIDE
{
const
int
begin
=
range
.
start
;
const
int
end
=
range
.
end
;
...
...
@@ -946,7 +946,7 @@ class MarkerContourParallel : public ParallelLoopBody {
MarkerContourParallel
(
vector
<
vector
<
Point
>
>&
_contours
,
vector
<
vector
<
Point2f
>
>&
_candidates
,
const
Mat
&
_camMatrix
,
const
Mat
&
_distCoeff
)
:
contours
(
_contours
),
candidates
(
_candidates
),
camMatrix
(
_camMatrix
),
distCoeff
(
_distCoeff
){}
void
operator
()(
const
Range
&
range
)
const
{
void
operator
()(
const
Range
&
range
)
const
CV_OVERRIDE
{
for
(
int
i
=
range
.
start
;
i
<
range
.
end
;
i
++
)
{
_refineCandidateLines
(
contours
[
i
],
candidates
[
i
],
camMatrix
,
distCoeff
);
...
...
@@ -1179,7 +1179,7 @@ class SinglePoseEstimationParallel : public ParallelLoopBody {
:
markerObjPoints
(
_markerObjPoints
),
corners
(
_corners
),
cameraMatrix
(
_cameraMatrix
),
distCoeffs
(
_distCoeffs
),
rvecs
(
_rvecs
),
tvecs
(
_tvecs
)
{}
void
operator
()(
const
Range
&
range
)
const
{
void
operator
()(
const
Range
&
range
)
const
CV_OVERRIDE
{
const
int
begin
=
range
.
start
;
const
int
end
=
range
.
end
;
...
...
modules/aruco/src/charuco.cpp
View file @
f730de1a
...
...
@@ -282,7 +282,7 @@ class CharucoSubpixelParallel : public ParallelLoopBody {
:
grey
(
_grey
),
filteredChessboardImgPoints
(
_filteredChessboardImgPoints
),
filteredWinSizes
(
_filteredWinSizes
),
params
(
_params
)
{}
void
operator
()(
const
Range
&
range
)
const
{
void
operator
()(
const
Range
&
range
)
const
CV_OVERRIDE
{
const
int
begin
=
range
.
start
;
const
int
end
=
range
.
end
;
...
...
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