Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
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
Commits
b37f0c5a
Commit
b37f0c5a
authored
Apr 14, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8522 from zongwave:master
parents
2d05db6f
1fc60e6d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
global_motion.hpp
...les/videostab/include/opencv2/videostab/global_motion.hpp
+1
-0
global_motion.cpp
modules/videostab/src/global_motion.cpp
+8
-0
No files found.
modules/videostab/include/opencv2/videostab/global_motion.hpp
View file @
b37f0c5a
...
...
@@ -236,6 +236,7 @@ public:
Ptr
<
IOutlierRejector
>
outlierRejector
()
const
{
return
outlierRejector_
;
}
virtual
Mat
estimate
(
const
Mat
&
frame0
,
const
Mat
&
frame1
,
bool
*
ok
=
0
);
Mat
estimate
(
InputArray
frame0
,
InputArray
frame1
,
bool
*
ok
=
0
);
private
:
Ptr
<
MotionEstimatorBase
>
motionEstimator_
;
...
...
modules/videostab/src/global_motion.cpp
View file @
b37f0c5a
...
...
@@ -710,6 +710,14 @@ KeypointBasedMotionEstimator::KeypointBasedMotionEstimator(Ptr<MotionEstimatorBa
Mat
KeypointBasedMotionEstimator
::
estimate
(
const
Mat
&
frame0
,
const
Mat
&
frame1
,
bool
*
ok
)
{
InputArray
image0
=
frame0
;
InputArray
image1
=
frame1
;
return
estimate
(
image0
,
image1
,
ok
);
}
Mat
KeypointBasedMotionEstimator
::
estimate
(
InputArray
frame0
,
InputArray
frame1
,
bool
*
ok
)
{
// find keypoints
detector_
->
detect
(
frame0
,
keypointsPrev_
);
...
...
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