mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

videostab: apply CV_OVERRIDE/CV_FINAL

Browse Source
This commit is contained in:
Alexander Alekhin 2018-03-15 16:17:05 +03:00
parent a8eb3e1b29
commit 2bd4f2c3a6
11 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/videostab/include/opencv2/videostab/deblurring.hpp
View File

@ -90,7 +90,7 @@ protected:
class CV_EXPORTS NullDeblurer : public DeblurerBase class CV_EXPORTS NullDeblurer : public DeblurerBase
{ {
public: public:
virtual void deblur(int /*idx*/, Mat &/*frame*/) {} virtual void deblur(int /*idx*/, Mat &/*frame*/) CV_OVERRIDE {}
}; };
class CV_EXPORTS WeightingDeblurer : public DeblurerBase class CV_EXPORTS WeightingDeblurer : public DeblurerBase
@ -101,7 +101,7 @@ public:
void setSensitivity(float val) { sensitivity_ = val; } void setSensitivity(float val) { sensitivity_ = val; }
float sensitivity() const { return sensitivity_; } float sensitivity() const { return sensitivity_; }
virtual void deblur(int idx, Mat &frame); virtual void deblur(int idx, Mat &frame) CV_OVERRIDE;
private: private:
float sensitivity_; float sensitivity_;

8
modules/videostab/include/opencv2/videostab/frame_source.hpp
View File

@ -65,8 +65,8 @@ public:
class CV_EXPORTS NullFrameSource : public IFrameSource class CV_EXPORTS NullFrameSource : public IFrameSource
{ {
public: public:
virtual void reset() {} virtual void reset() CV_OVERRIDE {}
virtual Mat nextFrame() { return Mat(); } virtual Mat nextFrame() CV_OVERRIDE { return Mat(); }
}; };
class CV_EXPORTS VideoFileSource : public IFrameSource class CV_EXPORTS VideoFileSource : public IFrameSource
@ -74,8 +74,8 @@ class CV_EXPORTS VideoFileSource : public IFrameSource
public: public:
VideoFileSource(const String &path, bool volatileFrame = false); VideoFileSource(const String &path, bool volatileFrame = false);
virtual void reset(); virtual void reset() CV_OVERRIDE;
virtual Mat nextFrame(); virtual Mat nextFrame() CV_OVERRIDE;
int width(); int width();
int height(); int height();

24
modules/videostab/include/opencv2/videostab/global_motion.hpp
View File

@ -139,7 +139,7 @@ public:
void setMinInlierRatio(float val) { minInlierRatio_ = val; } void setMinInlierRatio(float val) { minInlierRatio_ = val; }
float minInlierRatio() const { return minInlierRatio_; } float minInlierRatio() const { return minInlierRatio_; }
virtual Mat estimate(InputArray points0, InputArray points1, bool *ok = 0); virtual Mat estimate(InputArray points0, InputArray points1, bool *ok = 0) CV_OVERRIDE;
private: private:
RansacParams ransacParams_; RansacParams ransacParams_;
@ -155,7 +155,7 @@ class CV_EXPORTS MotionEstimatorL1 : public MotionEstimatorBase
public: public:
MotionEstimatorL1(MotionModel model = MM_AFFINE); MotionEstimatorL1(MotionModel model = MM_AFFINE);
virtual Mat estimate(InputArray points0, InputArray points1, bool *ok = 0); virtual Mat estimate(InputArray points0, InputArray points1, bool *ok = 0) CV_OVERRIDE;
private: private:
std::vector<double> obj_, collb_, colub_; std::vector<double> obj_, collb_, colub_;
@ -194,7 +194,7 @@ class CV_EXPORTS FromFileMotionReader : public ImageMotionEstimatorBase
public: public:
FromFileMotionReader(const String &path); FromFileMotionReader(const String &path);
virtual Mat estimate(const Mat &frame0, const Mat &frame1, bool *ok = 0); virtual Mat estimate(const Mat &frame0, const Mat &frame1, bool *ok = 0) CV_OVERRIDE;
private: private:
std::ifstream file_; std::ifstream file_;
@ -205,10 +205,10 @@ class CV_EXPORTS ToFileMotionWriter : public ImageMotionEstimatorBase
public: public:
ToFileMotionWriter(const String &path, Ptr<ImageMotionEstimatorBase> estimator); ToFileMotionWriter(const String &path, Ptr<ImageMotionEstimatorBase> estimator);
virtual void setMotionModel(MotionModel val) { motionEstimator_->setMotionModel(val); } virtual void setMotionModel(MotionModel val) CV_OVERRIDE { motionEstimator_->setMotionModel(val); }
virtual MotionModel motionModel() const { return motionEstimator_->motionModel(); } virtual MotionModel motionModel() const CV_OVERRIDE { return motionEstimator_->motionModel(); }
virtual Mat estimate(const Mat &frame0, const Mat &frame1, bool *ok = 0); virtual Mat estimate(const Mat &frame0, const Mat &frame1, bool *ok = 0) CV_OVERRIDE;
private: private:
std::ofstream file_; std::ofstream file_;
@ -223,8 +223,8 @@ class CV_EXPORTS KeypointBasedMotionEstimator : public ImageMotionEstimatorBase
public: public:
KeypointBasedMotionEstimator(Ptr<MotionEstimatorBase> estimator); KeypointBasedMotionEstimator(Ptr<MotionEstimatorBase> estimator);
virtual void setMotionModel(MotionModel val) { motionEstimator_->setMotionModel(val); } virtual void setMotionModel(MotionModel val) CV_OVERRIDE { motionEstimator_->setMotionModel(val); }
virtual MotionModel motionModel() const { return motionEstimator_->motionModel(); } virtual MotionModel motionModel() const CV_OVERRIDE { return motionEstimator_->motionModel(); }
void setDetector(Ptr<FeatureDetector> val) { detector_ = val; } void setDetector(Ptr<FeatureDetector> val) { detector_ = val; }
Ptr<FeatureDetector> detector() const { return detector_; } Ptr<FeatureDetector> detector() const { return detector_; }
@ -235,7 +235,7 @@ public:
void setOutlierRejector(Ptr<IOutlierRejector> val) { outlierRejector_ = val; } void setOutlierRejector(Ptr<IOutlierRejector> val) { outlierRejector_ = val; }
Ptr<IOutlierRejector> outlierRejector() const { return outlierRejector_; } Ptr<IOutlierRejector> outlierRejector() const { return outlierRejector_; }
virtual Mat estimate(const Mat &frame0, const Mat &frame1, bool *ok = 0); virtual Mat estimate(const Mat &frame0, const Mat &frame1, bool *ok = 0) CV_OVERRIDE;
Mat estimate(InputArray frame0, InputArray frame1, bool *ok = 0); Mat estimate(InputArray frame0, InputArray frame1, bool *ok = 0);
private: private:
@ -257,13 +257,13 @@ class CV_EXPORTS KeypointBasedMotionEstimatorGpu : public ImageMotionEstimatorBa
public: public:
KeypointBasedMotionEstimatorGpu(Ptr<MotionEstimatorBase> estimator); KeypointBasedMotionEstimatorGpu(Ptr<MotionEstimatorBase> estimator);
virtual void setMotionModel(MotionModel val) { motionEstimator_->setMotionModel(val); } virtual void setMotionModel(MotionModel val) CV_OVERRIDE { motionEstimator_->setMotionModel(val); }
virtual MotionModel motionModel() const { return motionEstimator_->motionModel(); } virtual MotionModel motionModel() const CV_OVERRIDE { return motionEstimator_->motionModel(); }
void setOutlierRejector(Ptr<IOutlierRejector> val) { outlierRejector_ = val; } void setOutlierRejector(Ptr<IOutlierRejector> val) { outlierRejector_ = val; }
Ptr<IOutlierRejector> outlierRejector() const { return outlierRejector_; } Ptr<IOutlierRejector> outlierRejector() const { return outlierRejector_; }
virtual Mat estimate(const Mat &frame0, const Mat &frame1, bool *ok = 0); 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); Mat estimate(const cuda::GpuMat &frame0, const cuda::GpuMat &frame1, bool *ok = 0);
private: private:

24
modules/videostab/include/opencv2/videostab/inpainting.hpp
View File

@ -102,7 +102,7 @@ protected:
class CV_EXPORTS NullInpainter : public InpainterBase class CV_EXPORTS NullInpainter : public InpainterBase
{ {
public: public:
virtual void inpaint(int /*idx*/, Mat &/*frame*/, Mat &/*mask*/) {} virtual void inpaint(int /*idx*/, Mat &/*frame*/, Mat &/*mask*/) CV_OVERRIDE {}
}; };
class CV_EXPORTS InpaintingPipeline : public InpainterBase class CV_EXPORTS InpaintingPipeline : public InpainterBase
@ -111,14 +111,14 @@ public:
void pushBack(Ptr<InpainterBase> inpainter) { inpainters_.push_back(inpainter); } void pushBack(Ptr<InpainterBase> inpainter) { inpainters_.push_back(inpainter); }
bool empty() const { return inpainters_.empty(); } bool empty() const { return inpainters_.empty(); }
virtual void setRadius(int val); virtual void setRadius(int val) CV_OVERRIDE;
virtual void setMotionModel(MotionModel val); virtual void setMotionModel(MotionModel val) CV_OVERRIDE;
virtual void setFrames(const std::vector<Mat> &val); virtual void setFrames(const std::vector<Mat> &val) CV_OVERRIDE;
virtual void setMotions(const std::vector<Mat> &val); virtual void setMotions(const std::vector<Mat> &val) CV_OVERRIDE;
virtual void setStabilizedFrames(const std::vector<Mat> &val); virtual void setStabilizedFrames(const std::vector<Mat> &val) CV_OVERRIDE;
virtual void setStabilizationMotions(const std::vector<Mat> &val); virtual void setStabilizationMotions(const std::vector<Mat> &val) CV_OVERRIDE;
virtual void inpaint(int idx, Mat &frame, Mat &mask); virtual void inpaint(int idx, Mat &frame, Mat &mask) CV_OVERRIDE;
private: private:
std::vector<Ptr<InpainterBase> > inpainters_; std::vector<Ptr<InpainterBase> > inpainters_;
@ -132,7 +132,7 @@ public:
void setStdevThresh(float val) { stdevThresh_ = val; } void setStdevThresh(float val) { stdevThresh_ = val; }
float stdevThresh() const { return stdevThresh_; } float stdevThresh() const { return stdevThresh_; }
virtual void inpaint(int idx, Mat &frame, Mat &mask); virtual void inpaint(int idx, Mat &frame, Mat &mask) CV_OVERRIDE;
private: private:
float stdevThresh_; float stdevThresh_;
@ -155,7 +155,7 @@ public:
void setBorderMode(int val) { borderMode_ = val; } void setBorderMode(int val) { borderMode_ = val; }
int borderMode() const { return borderMode_; } int borderMode() const { return borderMode_; }
virtual void inpaint(int idx, Mat &frame, Mat &mask); virtual void inpaint(int idx, Mat &frame, Mat &mask) CV_OVERRIDE;
private: private:
FastMarchingMethod fmm_; FastMarchingMethod fmm_;
@ -174,7 +174,7 @@ private:
class CV_EXPORTS ColorAverageInpainter : public InpainterBase class CV_EXPORTS ColorAverageInpainter : public InpainterBase
{ {
public: public:
virtual void inpaint(int idx, Mat &frame, Mat &mask); virtual void inpaint(int idx, Mat &frame, Mat &mask) CV_OVERRIDE;
private: private:
FastMarchingMethod fmm_; FastMarchingMethod fmm_;
@ -185,7 +185,7 @@ class CV_EXPORTS ColorInpainter : public InpainterBase
public: public:
ColorInpainter(int method = INPAINT_TELEA, double radius = 2.); ColorInpainter(int method = INPAINT_TELEA, double radius = 2.);
virtual void inpaint(int idx, Mat &frame, Mat &mask); virtual void inpaint(int idx, Mat &frame, Mat &mask) CV_OVERRIDE;
private: private:
int method_; int method_;

4
modules/videostab/include/opencv2/videostab/log.hpp
View File

@ -63,13 +63,13 @@ public:
class CV_EXPORTS NullLog : public ILog class CV_EXPORTS NullLog : public ILog
{ {
public: public:
virtual void print(const char * /*format*/, ...) {} virtual void print(const char * /*format*/, ...) CV_OVERRIDE {}
}; };
class CV_EXPORTS LogToStdout : public ILog class CV_EXPORTS LogToStdout : public ILog
{ {
public: public:
virtual void print(const char *format, ...); virtual void print(const char *format, ...) CV_OVERRIDE;
}; };
//! @} //! @}

8
modules/videostab/include/opencv2/videostab/motion_stabilizing.hpp
View File

@ -75,7 +75,7 @@ public:
virtual void stabilize( virtual void stabilize(
int size, const std::vector<Mat> &motions, std::pair<int,int> range, int size, const std::vector<Mat> &motions, std::pair<int,int> range,
Mat *stabilizationMotions); Mat *stabilizationMotions) CV_OVERRIDE;
private: private:
std::vector<Ptr<IMotionStabilizer> > stabilizers_; std::vector<Ptr<IMotionStabilizer> > stabilizers_;
@ -91,7 +91,7 @@ public:
virtual void stabilize( virtual void stabilize(
int size, const std::vector<Mat> &motions, std::pair<int,int> range, int size, const std::vector<Mat> &motions, std::pair<int,int> range,
Mat *stabilizationMotions); Mat *stabilizationMotions) CV_OVERRIDE;
}; };
class CV_EXPORTS GaussianMotionFilter : public MotionFilterBase class CV_EXPORTS GaussianMotionFilter : public MotionFilterBase
@ -104,7 +104,7 @@ public:
float stdev() const { return stdev_; } float stdev() const { return stdev_; }
virtual Mat stabilize( virtual Mat stabilize(
int idx, const std::vector<Mat> &motions, std::pair<int,int> range); int idx, const std::vector<Mat> &motions, std::pair<int,int> range) CV_OVERRIDE;
private: private:
int radius_; int radius_;
@ -142,7 +142,7 @@ public:
virtual void stabilize( virtual void stabilize(
int size, const std::vector<Mat> &motions, std::pair<int,int> range, int size, const std::vector<Mat> &motions, std::pair<int,int> range,
Mat *stabilizationMotions); Mat *stabilizationMotions) CV_OVERRIDE;
private: private:
MotionModel model_; MotionModel model_;

4
modules/videostab/include/opencv2/videostab/optical_flow.hpp
View File

@ -99,7 +99,7 @@ class CV_EXPORTS SparsePyrLkOptFlowEstimator
public: public:
virtual void run( virtual void run(
InputArray frame0, InputArray frame1, InputArray points0, InputOutputArray points1, InputArray frame0, InputArray frame1, InputArray points0, InputOutputArray points1,
OutputArray status, OutputArray errors); OutputArray status, OutputArray errors) CV_OVERRIDE;
}; };
#ifdef HAVE_OPENCV_CUDAOPTFLOW #ifdef HAVE_OPENCV_CUDAOPTFLOW
@ -112,7 +112,7 @@ public:
virtual void run( virtual void run(
InputArray frame0, InputArray frame1, InputArray points0, InputOutputArray points1, InputArray frame0, InputArray frame1, InputArray points0, InputOutputArray points1,
OutputArray status, OutputArray errors); OutputArray status, OutputArray errors) CV_OVERRIDE;
void run(const cuda::GpuMat &frame0, const cuda::GpuMat &frame1, const cuda::GpuMat &points0, cuda::GpuMat &points1, void run(const cuda::GpuMat &frame0, const cuda::GpuMat &frame1, const cuda::GpuMat &points0, cuda::GpuMat &points1,
cuda::GpuMat &status, cuda::GpuMat &errors); cuda::GpuMat &status, cuda::GpuMat &errors);

4
modules/videostab/include/opencv2/videostab/outlier_rejection.hpp
View File

@ -68,7 +68,7 @@ class CV_EXPORTS NullOutlierRejector : public IOutlierRejector
{ {
public: public:
virtual void process( virtual void process(
Size frameSize, InputArray points0, InputArray points1, OutputArray mask); Size frameSize, InputArray points0, InputArray points1, OutputArray mask) CV_OVERRIDE;
}; };
class CV_EXPORTS TranslationBasedLocalOutlierRejector : public IOutlierRejector class CV_EXPORTS TranslationBasedLocalOutlierRejector : public IOutlierRejector
@ -83,7 +83,7 @@ public:
RansacParams ransacParams() const { return ransacParams_; } RansacParams ransacParams() const { return ransacParams_; }
virtual void process( virtual void process(
Size frameSize, InputArray points0, InputArray points1, OutputArray mask); Size frameSize, InputArray points0, InputArray points1, OutputArray mask) CV_OVERRIDE;
private: private:
Size cellSize_; Size cellSize_;

24
modules/videostab/include/opencv2/videostab/stabilizer.hpp
View File

@ -144,14 +144,14 @@ public:
void setMotionFilter(Ptr<MotionFilterBase> val) { motionFilter_ = val; } void setMotionFilter(Ptr<MotionFilterBase> val) { motionFilter_ = val; }
Ptr<MotionFilterBase> motionFilter() const { return motionFilter_; } Ptr<MotionFilterBase> motionFilter() const { return motionFilter_; }
virtual void reset(); virtual void reset() CV_OVERRIDE;
virtual Mat nextFrame() { return nextStabilizedFrame(); } virtual Mat nextFrame() CV_OVERRIDE { return nextStabilizedFrame(); }
protected: protected:
virtual void setUp(const Mat &firstFrame); virtual void setUp(const Mat &firstFrame) CV_OVERRIDE;
virtual Mat estimateMotion(); virtual Mat estimateMotion() CV_OVERRIDE;
virtual Mat estimateStabilizationMotion(); virtual Mat estimateStabilizationMotion() CV_OVERRIDE;
virtual Mat postProcessFrame(const Mat &frame); virtual Mat postProcessFrame(const Mat &frame) CV_OVERRIDE;
Ptr<MotionFilterBase> motionFilter_; Ptr<MotionFilterBase> motionFilter_;
}; };
@ -170,16 +170,16 @@ public:
void setEstimateTrimRatio(bool val) { mustEstTrimRatio_ = val; } void setEstimateTrimRatio(bool val) { mustEstTrimRatio_ = val; }
bool mustEstimateTrimaRatio() const { return mustEstTrimRatio_; } bool mustEstimateTrimaRatio() const { return mustEstTrimRatio_; }
virtual void reset(); virtual void reset() CV_OVERRIDE;
virtual Mat nextFrame(); virtual Mat nextFrame() CV_OVERRIDE;
protected: protected:
void runPrePassIfNecessary(); void runPrePassIfNecessary();
virtual void setUp(const Mat &firstFrame); virtual void setUp(const Mat &firstFrame) CV_OVERRIDE;
virtual Mat estimateMotion(); virtual Mat estimateMotion() CV_OVERRIDE;
virtual Mat estimateStabilizationMotion(); virtual Mat estimateStabilizationMotion() CV_OVERRIDE;
virtual Mat postProcessFrame(const Mat &frame); virtual Mat postProcessFrame(const Mat &frame) CV_OVERRIDE;
Ptr<IMotionStabilizer> motionStabilizer_; Ptr<IMotionStabilizer> motionStabilizer_;
Ptr<WobbleSuppressorBase> wobbleSuppressor_; Ptr<WobbleSuppressorBase> wobbleSuppressor_;

4
modules/videostab/include/opencv2/videostab/wobble_suppression.hpp
View File

@ -95,7 +95,7 @@ protected:
class CV_EXPORTS NullWobbleSuppressor : public WobbleSuppressorBase class CV_EXPORTS NullWobbleSuppressor : public WobbleSuppressorBase
{ {
public: public:
virtual void suppress(int idx, const Mat &frame, Mat &result); virtual void suppress(int idx, const Mat &frame, Mat &result) CV_OVERRIDE;
}; };
class CV_EXPORTS MoreAccurateMotionWobbleSuppressorBase : public WobbleSuppressorBase class CV_EXPORTS MoreAccurateMotionWobbleSuppressorBase : public WobbleSuppressorBase
@ -113,7 +113,7 @@ protected:
class CV_EXPORTS MoreAccurateMotionWobbleSuppressor : public MoreAccurateMotionWobbleSuppressorBase class CV_EXPORTS MoreAccurateMotionWobbleSuppressor : public MoreAccurateMotionWobbleSuppressorBase
{ {
public: public:
virtual void suppress(int idx, const Mat &frame, Mat &result); virtual void suppress(int idx, const Mat &frame, Mat &result) CV_OVERRIDE;
private: private:
Mat_<float> mapx_, mapy_; Mat_<float> mapx_, mapy_;

4
modules/videostab/src/frame_source.cpp
View File

@ -62,7 +62,7 @@ public:
VideoFileSourceImpl(const String &path, bool volatileFrame) VideoFileSourceImpl(const String &path, bool volatileFrame)
: path_(path), volatileFrame_(volatileFrame) { reset(); } : path_(path), volatileFrame_(volatileFrame) { reset(); }
virtual void reset() virtual void reset() CV_OVERRIDE
{ {
#ifdef HAVE_OPENCV_VIDEOIO #ifdef HAVE_OPENCV_VIDEOIO
vc.release(); vc.release();
@ -74,7 +74,7 @@ public:
#endif #endif
} }
virtual Mat nextFrame() virtual Mat nextFrame() CV_OVERRIDE
{ {
Mat frame; Mat frame;
#ifdef HAVE_OPENCV_VIDEOIO #ifdef HAVE_OPENCV_VIDEOIO