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
036e6995
Commit
036e6995
authored
Mar 21, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
samples: apply CV_OVERRIDE/CV_FINAL
parent
5354a1bf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
15 deletions
+15
-15
sparse_matching_gpc.hpp
...s/optflow/include/opencv2/optflow/sparse_matching_gpc.hpp
+3
-3
simple_pipeline.hpp
modules/sfm/include/opencv2/sfm/simple_pipeline.hpp
+10
-10
webcam_demo.cpp
modules/text/samples/webcam_demo.cpp
+2
-2
No files found.
modules/optflow/include/opencv2/optflow/sparse_matching_gpc.hpp
View file @
036e6995
...
...
@@ -227,7 +227,7 @@ private:
ParallelTrailsFilling
(
const
GPCForest
*
_forest
,
const
std
::
vector
<
GPCPatchDescriptor
>
*
_descr
,
std
::
vector
<
Trail
>
*
_trails
)
:
forest
(
_forest
),
descr
(
_descr
),
trails
(
_trails
){};
void
operator
()(
const
Range
&
range
)
const
void
operator
()(
const
Range
&
range
)
const
CV_OVERRIDE
{
for
(
int
t
=
range
.
start
;
t
<
range
.
end
;
++
t
)
for
(
size_t
i
=
0
;
i
<
descr
->
size
();
++
i
)
...
...
@@ -272,7 +272,7 @@ public:
}
}
void
write
(
FileStorage
&
fs
)
const
void
write
(
FileStorage
&
fs
)
const
CV_OVERRIDE
{
fs
<<
"ntrees"
<<
T
<<
"trees"
<<
"["
;
...
...
@@ -285,7 +285,7 @@ public:
fs
<<
"]"
;
}
void
read
(
const
FileNode
&
fn
)
void
read
(
const
FileNode
&
fn
)
CV_OVERRIDE
{
CV_Assert
(
T
<=
(
int
)
fn
[
"ntrees"
]
);
FileNodeIterator
it
=
fn
[
"trees"
].
begin
();
...
...
modules/sfm/include/opencv2/sfm/simple_pipeline.hpp
View file @
036e6995
...
...
@@ -196,7 +196,7 @@ public:
- Tracks must be as precise as possible. It does not handle outliers and is very sensible to them.
*/
CV_WRAP
virtual
void
run
(
InputArrayOfArrays
points2d
)
=
0
;
virtual
void
run
(
InputArrayOfArrays
points2d
)
CV_OVERRIDE
=
0
;
/** @brief Calls the pipeline in order to perform Eclidean reconstruction.
@param points2d Input vector of vectors of 2d points (the inner vector is per image).
...
...
@@ -210,7 +210,7 @@ public:
*/
CV_WRAP
virtual
void
run
(
InputArrayOfArrays
points2d
,
InputOutputArray
K
,
OutputArray
Rs
,
OutputArray
Ts
,
OutputArray
points3d
)
=
0
;
OutputArray
Ts
,
OutputArray
points3d
)
CV_OVERRIDE
=
0
;
/** @brief Calls the pipeline in order to perform Eclidean reconstruction.
@param images a vector of string with the images paths.
...
...
@@ -219,7 +219,7 @@ public:
- The images must be ordered as they were an image sequence. Additionally, each frame should be as close as posible to the previous and posterior.
- For now DAISY features are used in order to compute the 2d points tracks and it only works for 3-4 images.
*/
virtual
void
run
(
const
std
::
vector
<
String
>
&
images
)
=
0
;
virtual
void
run
(
const
std
::
vector
<
String
>
&
images
)
CV_OVERRIDE
=
0
;
/** @brief Calls the pipeline in order to perform Eclidean reconstruction.
@param images a vector of string with the images paths.
...
...
@@ -233,30 +233,30 @@ public:
- For now DAISY features are used in order to compute the 2d points tracks and it only works for 3-4 images.
*/
virtual
void
run
(
const
std
::
vector
<
String
>
&
images
,
InputOutputArray
K
,
OutputArray
Rs
,
OutputArray
Ts
,
OutputArray
points3d
)
=
0
;
OutputArray
Ts
,
OutputArray
points3d
)
CV_OVERRIDE
=
0
;
/** @brief Returns the computed reprojection error.
*/
CV_WRAP
virtual
double
getError
()
const
=
0
;
virtual
double
getError
()
const
CV_OVERRIDE
=
0
;
/** @brief Returns the estimated 3d points.
@param points3d Output array with estimated 3d points.
*/
CV_WRAP
virtual
void
getPoints
(
OutputArray
points3d
)
=
0
;
virtual
void
getPoints
(
OutputArray
points3d
)
CV_OVERRIDE
=
0
;
/** @brief Returns the refined camera calibration matrix.
*/
CV_WRAP
virtual
cv
::
Mat
getIntrinsics
()
const
=
0
;
virtual
cv
::
Mat
getIntrinsics
()
const
CV_OVERRIDE
=
0
;
/** @brief Returns the estimated camera extrinsic parameters.
@param Rs Output vector of 3x3 rotations of the camera.
@param Ts Output vector of 3x1 translations of the camera.
*/
CV_WRAP
virtual
void
getCameras
(
OutputArray
Rs
,
OutputArray
Ts
)
=
0
;
virtual
void
getCameras
(
OutputArray
Rs
,
OutputArray
Ts
)
CV_OVERRIDE
=
0
;
/** @brief Setter method for reconstruction options.
@param libmv_reconstruction_options struct with reconstruction options such as initial keyframes,
...
...
@@ -264,7 +264,7 @@ public:
*/
CV_WRAP
virtual
void
setReconstructionOptions
(
const
libmv_ReconstructionOptions
&
libmv_reconstruction_options
)
=
0
;
setReconstructionOptions
(
const
libmv_ReconstructionOptions
&
libmv_reconstruction_options
)
CV_OVERRIDE
=
0
;
/** @brief Setter method for camera intrinsic options.
@param libmv_camera_intrinsics_options struct with camera intrinsic options such as camera model and
...
...
@@ -272,7 +272,7 @@ public:
*/
CV_WRAP
virtual
void
setCameraIntrinsicOptions
(
const
libmv_CameraIntrinsicsOptions
&
libmv_camera_intrinsics_options
)
=
0
;
setCameraIntrinsicOptions
(
const
libmv_CameraIntrinsicsOptions
&
libmv_camera_intrinsics_options
)
CV_OVERRIDE
=
0
;
/** @brief Creates an instance of the SFMLibmvEuclideanReconstruction class. Initializes Libmv. */
static
Ptr
<
SFMLibmvEuclideanReconstruction
>
...
...
modules/text/samples/webcam_demo.cpp
View file @
036e6995
...
...
@@ -32,7 +32,7 @@ public:
vector
<
Ptr
<
ERFilter
>
>
_er_filter1
,
vector
<
Ptr
<
ERFilter
>
>
_er_filter2
)
:
channels
(
_channels
),
regions
(
_regions
),
er_filter1
(
_er_filter1
),
er_filter2
(
_er_filter2
)
{}
virtual
void
operator
()(
const
cv
::
Range
&
r
)
const
virtual
void
operator
()(
const
cv
::
Range
&
r
)
const
CV_OVERRIDE
{
for
(
int
c
=
r
.
start
;
c
<
r
.
end
;
c
++
)
{
...
...
@@ -63,7 +63,7 @@ public:
confidences
(
_confidences
),
ocrs
(
_ocrs
)
{}
virtual
void
operator
()(
const
cv
::
Range
&
r
)
const
virtual
void
operator
()(
const
cv
::
Range
&
r
)
const
CV_OVERRIDE
{
for
(
int
c
=
r
.
start
;
c
<
r
.
end
;
c
++
)
{
...
...
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