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
8049208c
Commit
8049208c
authored
Apr 28, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2109 from alalek:fix_cuda_build
parents
996c6e7a
aa04285d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
global_motion.hpp
...les/videostab/include/opencv2/videostab/global_motion.hpp
+0
-3
global_motion.cpp
modules/videostab/src/global_motion.cpp
+1
-1
No files found.
modules/videostab/include/opencv2/videostab/global_motion.hpp
View file @
8049208c
...
...
@@ -274,8 +274,6 @@ public:
void
setOutlierRejector
(
Ptr
<
IOutlierRejector
>
val
)
{
outlierRejector_
=
val
;
}
Ptr
<
IOutlierRejector
>
outlierRejector
()
const
{
return
outlierRejector_
;
}
virtual
void
setFrameMask
(
InputArray
mask
)
CV_OVERRIDE
{
mask_
=
mask
.
getMat
();
}
virtual
Mat
estimate
(
const
Mat
&
frame0
,
const
Mat
&
frame1
,
bool
*
ok
=
0
)
CV_OVERRIDE
;
Mat
estimate
(
const
cuda
::
GpuMat
&
frame0
,
const
cuda
::
GpuMat
&
frame1
,
bool
*
ok
=
0
);
...
...
@@ -284,7 +282,6 @@ private:
Ptr
<
cuda
::
CornersDetector
>
detector_
;
SparsePyrLkOptFlowEstimatorGpu
optFlowEstimator_
;
Ptr
<
IOutlierRejector
>
outlierRejector_
;
GpuMat
mask_
;
cuda
::
GpuMat
frame0_
,
grayFrame0_
,
frame1_
;
cuda
::
GpuMat
pointsPrev_
,
points_
;
...
...
modules/videostab/src/global_motion.cpp
View file @
8049208c
...
...
@@ -815,7 +815,7 @@ Mat KeypointBasedMotionEstimatorGpu::estimate(const cuda::GpuMat &frame0, const
}
// find keypoints
detector_
->
detect
(
grayFrame0
,
pointsPrev_
,
mask_
);
detector_
->
detect
(
grayFrame0
,
pointsPrev_
);
// find correspondences
optFlowEstimator_
.
run
(
frame0
,
frame1
,
pointsPrev_
,
points_
,
status_
);
...
...
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