Skip to content

Commit aa04285

Browse files
committed
videostab: fix CUDA build
reverts CUDA related stuff of commit ff0167b
1 parent 996c6e7 commit aa04285

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

modules/videostab/include/opencv2/videostab/global_motion.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,6 @@ class CV_EXPORTS KeypointBasedMotionEstimatorGpu : public ImageMotionEstimatorBa
274274
void setOutlierRejector(Ptr<IOutlierRejector> val) { outlierRejector_ = val; }
275275
Ptr<IOutlierRejector> outlierRejector() const { return outlierRejector_; }
276276

277-
virtual void setFrameMask(InputArray mask) CV_OVERRIDE { mask_ = mask.getMat(); }
278-
279277
virtual Mat estimate(const Mat &frame0, const Mat &frame1, bool *ok = 0) CV_OVERRIDE;
280278
Mat estimate(const cuda::GpuMat &frame0, const cuda::GpuMat &frame1, bool *ok = 0);
281279

@@ -284,7 +282,6 @@ class CV_EXPORTS KeypointBasedMotionEstimatorGpu : public ImageMotionEstimatorBa
284282
Ptr<cuda::CornersDetector> detector_;
285283
SparsePyrLkOptFlowEstimatorGpu optFlowEstimator_;
286284
Ptr<IOutlierRejector> outlierRejector_;
287-
GpuMat mask_;
288285

289286
cuda::GpuMat frame0_, grayFrame0_, frame1_;
290287
cuda::GpuMat pointsPrev_, points_;

modules/videostab/src/global_motion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ Mat KeypointBasedMotionEstimatorGpu::estimate(const cuda::GpuMat &frame0, const
815815
}
816816

817817
// find keypoints
818-
detector_->detect(grayFrame0, pointsPrev_, mask_);
818+
detector_->detect(grayFrame0, pointsPrev_);
819819

820820
// find correspondences
821821
optFlowEstimator_.run(frame0, frame1, pointsPrev_, points_, status_);

0 commit comments

Comments
 (0)