videostab: apply CV_OVERRIDE/CV_FINAL

diff --git a/modules/videostab/include/opencv2/videostab/deblurring.hpp b/modules/videostab/include/opencv2/videostab/deblurring.hpp
index b383f0d..c665640 100644 (file)
--- a/modules/videostab/include/opencv2/videostab/deblurring.hpp
+++ b/modules/videostab/include/opencv2/videostab/deblurring.hpp
@@ -90,7 +90,7 @@ protected:
 class CV_EXPORTS NullDeblurer : public DeblurerBase
 {
 public:
-    virtual void deblur(int /*idx*/, Mat &/*frame*/) {}
+    virtual void deblur(int /*idx*/, Mat &/*frame*/) CV_OVERRIDE {}
 };
 
 class CV_EXPORTS WeightingDeblurer : public DeblurerBase
@@ -101,7 +101,7 @@ public:
     void setSensitivity(float val) { sensitivity_ = val; }
     float sensitivity() const { return sensitivity_; }
 
-    virtual void deblur(int idx, Mat &frame);
+    virtual void deblur(int idx, Mat &frame) CV_OVERRIDE;
 
 private:
     float sensitivity_;

diff --git a/modules/videostab/include/opencv2/videostab/frame_source.hpp b/modules/videostab/include/opencv2/videostab/frame_source.hpp
index e4e00b5..171c637 100644 (file)
--- a/modules/videostab/include/opencv2/videostab/frame_source.hpp
+++ b/modules/videostab/include/opencv2/videostab/frame_source.hpp
@@ -65,8 +65,8 @@ public:
 class CV_EXPORTS NullFrameSource : public IFrameSource
 {
 public:
-    virtual void reset() {}
-    virtual Mat nextFrame() { return Mat(); }
+    virtual void reset() CV_OVERRIDE {}
+    virtual Mat nextFrame() CV_OVERRIDE { return Mat(); }
 };
 
 class CV_EXPORTS VideoFileSource : public IFrameSource
@@ -74,8 +74,8 @@ class CV_EXPORTS VideoFileSource : public IFrameSource
 public:
     VideoFileSource(const String &path, bool volatileFrame = false);
 
-    virtual void reset();
-    virtual Mat nextFrame();
+    virtual void reset() CV_OVERRIDE;
+    virtual Mat nextFrame() CV_OVERRIDE;
 
     int width();
     int height();

diff --git a/modules/videostab/include/opencv2/videostab/global_motion.hpp b/modules/videostab/include/opencv2/videostab/global_motion.hpp
index 1fbe0c8..fedca2c 100644 (file)
--- a/modules/videostab/include/opencv2/videostab/global_motion.hpp
+++ b/modules/videostab/include/opencv2/videostab/global_motion.hpp
@@ -139,7 +139,7 @@ public:
     void setMinInlierRatio(float val) { minInlierRatio_ = val; }
     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:
     RansacParams ransacParams_;
@@ -155,7 +155,7 @@ class CV_EXPORTS MotionEstimatorL1 : public MotionEstimatorBase
 public:
     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:
     std::vector<double> obj_, collb_, colub_;
@@ -194,7 +194,7 @@ class CV_EXPORTS FromFileMotionReader : public ImageMotionEstimatorBase
 public:
     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:
     std::ifstream file_;
@@ -205,10 +205,10 @@ class CV_EXPORTS ToFileMotionWriter : public ImageMotionEstimatorBase
 public:
     ToFileMotionWriter(const String &path, Ptr<ImageMotionEstimatorBase> estimator);
 
-    virtual void setMotionModel(MotionModel val) { motionEstimator_->setMotionModel(val); }
-    virtual MotionModel motionModel() const { return motionEstimator_->motionModel(); }
+    virtual void setMotionModel(MotionModel val) CV_OVERRIDE { motionEstimator_->setMotionModel(val); }
+    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:
     std::ofstream file_;
@@ -223,8 +223,8 @@ class CV_EXPORTS KeypointBasedMotionEstimator : public ImageMotionEstimatorBase
 public:
     KeypointBasedMotionEstimator(Ptr<MotionEstimatorBase> estimator);
 
-    virtual void setMotionModel(MotionModel val) { motionEstimator_->setMotionModel(val); }
-    virtual MotionModel motionModel() const { return motionEstimator_->motionModel(); }
+    virtual void setMotionModel(MotionModel val) CV_OVERRIDE { motionEstimator_->setMotionModel(val); }
+    virtual MotionModel motionModel() const CV_OVERRIDE { return motionEstimator_->motionModel(); }
 
     void setDetector(Ptr<FeatureDetector> val) { detector_ = val; }
     Ptr<FeatureDetector> detector() const { return detector_; }
@@ -235,7 +235,7 @@ public:
     void setOutlierRejector(Ptr<IOutlierRejector> val) { outlierRejector_ = val; }
     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);
 
 private:
@@ -257,13 +257,13 @@ class CV_EXPORTS KeypointBasedMotionEstimatorGpu : public ImageMotionEstimatorBa
 public:
     KeypointBasedMotionEstimatorGpu(Ptr<MotionEstimatorBase> estimator);
 
-    virtual void setMotionModel(MotionModel val) { motionEstimator_->setMotionModel(val); }
-    virtual MotionModel motionModel() const { return motionEstimator_->motionModel(); }
+    virtual void setMotionModel(MotionModel val) CV_OVERRIDE { motionEstimator_->setMotionModel(val); }
+    virtual MotionModel motionModel() const CV_OVERRIDE { return motionEstimator_->motionModel(); }
 
     void setOutlierRejector(Ptr<IOutlierRejector> val) { outlierRejector_ = val; }
     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);
 
 private:

diff --git a/modules/videostab/include/opencv2/videostab/inpainting.hpp b/modules/videostab/include/opencv2/videostab/inpainting.hpp
index 61eeec3..9c123f0 100644 (file)
--- a/modules/videostab/include/opencv2/videostab/inpainting.hpp
+++ b/modules/videostab/include/opencv2/videostab/inpainting.hpp
@@ -102,7 +102,7 @@ protected:
 class CV_EXPORTS NullInpainter : public InpainterBase
 {
 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
@@ -111,14 +111,14 @@ public:
     void pushBack(Ptr<InpainterBase> inpainter) { inpainters_.push_back(inpainter); }
     bool empty() const { return inpainters_.empty(); }
 
-    virtual void setRadius(int val);
-    virtual void setMotionModel(MotionModel val);
-    virtual void setFrames(const std::vector<Mat> &val);
-    virtual void setMotions(const std::vector<Mat> &val);
-    virtual void setStabilizedFrames(const std::vector<Mat> &val);
-    virtual void setStabilizationMotions(const std::vector<Mat> &val);
+    virtual void setRadius(int val) CV_OVERRIDE;
+    virtual void setMotionModel(MotionModel val) CV_OVERRIDE;
+    virtual void setFrames(const std::vector<Mat> &val) CV_OVERRIDE;
+    virtual void setMotions(const std::vector<Mat> &val) CV_OVERRIDE;
+    virtual void setStabilizedFrames(const std::vector<Mat> &val) CV_OVERRIDE;
+    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:
     std::vector<Ptr<InpainterBase> > inpainters_;
@@ -132,7 +132,7 @@ public:
     void setStdevThresh(float val) { stdevThresh_ = val; }
     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:
     float stdevThresh_;
@@ -155,7 +155,7 @@ public:
     void setBorderMode(int val) { borderMode_ = val; }
     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:
     FastMarchingMethod fmm_;
@@ -174,7 +174,7 @@ private:
 class CV_EXPORTS ColorAverageInpainter : public InpainterBase
 {
 public:
-    virtual void inpaint(int idx, Mat &frame, Mat &mask);
+    virtual void inpaint(int idx, Mat &frame, Mat &mask) CV_OVERRIDE;
 
 private:
     FastMarchingMethod fmm_;
@@ -185,7 +185,7 @@ class CV_EXPORTS ColorInpainter : public InpainterBase
 public:
     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:
     int method_;

diff --git a/modules/videostab/include/opencv2/videostab/log.hpp b/modules/videostab/include/opencv2/videostab/log.hpp
index 81c634a..73e7049 100644 (file)
--- a/modules/videostab/include/opencv2/videostab/log.hpp
+++ b/modules/videostab/include/opencv2/videostab/log.hpp
@@ -63,13 +63,13 @@ public:
 class CV_EXPORTS NullLog : public ILog
 {
 public:
-    virtual void print(const char * /*format*/, ...) {}
+    virtual void print(const char * /*format*/, ...) CV_OVERRIDE {}
 };
 
 class CV_EXPORTS LogToStdout : public ILog
 {
 public:
-    virtual void print(const char *format, ...);
+    virtual void print(const char *format, ...) CV_OVERRIDE;
 };
 
 //! @}

diff --git a/modules/videostab/include/opencv2/videostab/motion_stabilizing.hpp b/modules/videostab/include/opencv2/videostab/motion_stabilizing.hpp
index 5ea5a65..c50095b 100644 (file)
--- a/modules/videostab/include/opencv2/videostab/motion_stabilizing.hpp
+++ b/modules/videostab/include/opencv2/videostab/motion_stabilizing.hpp
@@ -75,7 +75,7 @@ public:
 
     virtual void stabilize(
             int size, const std::vector<Mat> &motions, std::pair<int,int> range,
-            Mat *stabilizationMotions);
+            Mat *stabilizationMotions) CV_OVERRIDE;
 
 private:
     std::vector<Ptr<IMotionStabilizer> > stabilizers_;
@@ -91,7 +91,7 @@ public:
 
     virtual void stabilize(
             int size, const std::vector<Mat> &motions, std::pair<int,int> range,
-            Mat *stabilizationMotions);
+            Mat *stabilizationMotions) CV_OVERRIDE;
 };
 
 class CV_EXPORTS GaussianMotionFilter : public MotionFilterBase
@@ -104,7 +104,7 @@ public:
     float stdev() const { return stdev_; }
 
     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:
     int radius_;
@@ -142,7 +142,7 @@ public:
 
     virtual void stabilize(
             int size, const std::vector<Mat> &motions, std::pair<int,int> range,
-            Mat *stabilizationMotions);
+            Mat *stabilizationMotions) CV_OVERRIDE;
 
 private:
     MotionModel model_;

diff --git a/modules/videostab/include/opencv2/videostab/optical_flow.hpp b/modules/videostab/include/opencv2/videostab/optical_flow.hpp
index d631488..63f0f3b 100644 (file)
--- a/modules/videostab/include/opencv2/videostab/optical_flow.hpp
+++ b/modules/videostab/include/opencv2/videostab/optical_flow.hpp
@@ -99,7 +99,7 @@ class CV_EXPORTS SparsePyrLkOptFlowEstimator
 public:
     virtual void run(
             InputArray frame0, InputArray frame1, InputArray points0, InputOutputArray points1,
-            OutputArray status, OutputArray errors);
+            OutputArray status, OutputArray errors) CV_OVERRIDE;
 };
 
 #ifdef HAVE_OPENCV_CUDAOPTFLOW
@@ -112,7 +112,7 @@ public:
 
     virtual void run(
             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,
              cuda::GpuMat &status, cuda::GpuMat &errors);

diff --git a/modules/videostab/include/opencv2/videostab/outlier_rejection.hpp b/modules/videostab/include/opencv2/videostab/outlier_rejection.hpp
index 9b9b384..1d29896 100644 (file)
--- a/modules/videostab/include/opencv2/videostab/outlier_rejection.hpp
+++ b/modules/videostab/include/opencv2/videostab/outlier_rejection.hpp
@@ -68,7 +68,7 @@ class CV_EXPORTS NullOutlierRejector : public IOutlierRejector
 {
 public:
     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
@@ -83,7 +83,7 @@ public:
     RansacParams ransacParams() const { return ransacParams_; }
 
     virtual void process(
-            Size frameSize, InputArray points0, InputArray points1, OutputArray mask);
+            Size frameSize, InputArray points0, InputArray points1, OutputArray mask) CV_OVERRIDE;
 
 private:
     Size cellSize_;

diff --git a/modules/videostab/include/opencv2/videostab/stabilizer.hpp b/modules/videostab/include/opencv2/videostab/stabilizer.hpp
index b78b4ea..634a0aa 100644 (file)
--- a/modules/videostab/include/opencv2/videostab/stabilizer.hpp
+++ b/modules/videostab/include/opencv2/videostab/stabilizer.hpp
@@ -144,14 +144,14 @@ public:
     void setMotionFilter(Ptr<MotionFilterBase> val) { motionFilter_ = val; }
     Ptr<MotionFilterBase> motionFilter() const { return motionFilter_; }
 
-    virtual void reset();
-    virtual Mat nextFrame() { return nextStabilizedFrame(); }
+    virtual void reset() CV_OVERRIDE;
+    virtual Mat nextFrame() CV_OVERRIDE { return nextStabilizedFrame(); }
 
 protected:
-    virtual void setUp(const Mat &firstFrame);
-    virtual Mat estimateMotion();
-    virtual Mat estimateStabilizationMotion();
-    virtual Mat postProcessFrame(const Mat &frame);
+    virtual void setUp(const Mat &firstFrame) CV_OVERRIDE;
+    virtual Mat estimateMotion() CV_OVERRIDE;
+    virtual Mat estimateStabilizationMotion() CV_OVERRIDE;
+    virtual Mat postProcessFrame(const Mat &frame) CV_OVERRIDE;
 
     Ptr<MotionFilterBase> motionFilter_;
 };
@@ -170,16 +170,16 @@ public:
     void setEstimateTrimRatio(bool val) { mustEstTrimRatio_ = val; }
     bool mustEstimateTrimaRatio() const { return mustEstTrimRatio_; }
 
-    virtual void reset();
-    virtual Mat nextFrame();
+    virtual void reset() CV_OVERRIDE;
+    virtual Mat nextFrame() CV_OVERRIDE;
 
 protected:
     void runPrePassIfNecessary();
 
-    virtual void setUp(const Mat &firstFrame);
-    virtual Mat estimateMotion();
-    virtual Mat estimateStabilizationMotion();
-    virtual Mat postProcessFrame(const Mat &frame);
+    virtual void setUp(const Mat &firstFrame) CV_OVERRIDE;
+    virtual Mat estimateMotion() CV_OVERRIDE;
+    virtual Mat estimateStabilizationMotion() CV_OVERRIDE;
+    virtual Mat postProcessFrame(const Mat &frame) CV_OVERRIDE;
 
     Ptr<IMotionStabilizer> motionStabilizer_;
     Ptr<WobbleSuppressorBase> wobbleSuppressor_;

diff --git a/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp b/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp
index a44410b..19a5a74 100644 (file)
--- a/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp
+++ b/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp
@@ -95,7 +95,7 @@ protected:
 class CV_EXPORTS NullWobbleSuppressor : public WobbleSuppressorBase
 {
 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
@@ -113,7 +113,7 @@ protected:
 class CV_EXPORTS MoreAccurateMotionWobbleSuppressor : public MoreAccurateMotionWobbleSuppressorBase
 {
 public:
-    virtual void suppress(int idx, const Mat &frame, Mat &result);
+    virtual void suppress(int idx, const Mat &frame, Mat &result) CV_OVERRIDE;
 
 private:
     Mat_<float> mapx_, mapy_;

diff --git a/modules/videostab/src/frame_source.cpp b/modules/videostab/src/frame_source.cpp
index 07237de..a0176f1 100644 (file)
--- a/modules/videostab/src/frame_source.cpp
+++ b/modules/videostab/src/frame_source.cpp
@@ -62,7 +62,7 @@ public:
     VideoFileSourceImpl(const String &path, bool volatileFrame)
         : path_(path), volatileFrame_(volatileFrame) { reset(); }
 
-    virtual void reset()
+    virtual void reset() CV_OVERRIDE
     {
 #ifdef HAVE_OPENCV_VIDEOIO
         vc.release();
@@ -74,7 +74,7 @@ public:
 #endif
     }
 
-    virtual Mat nextFrame()
+    virtual Mat nextFrame() CV_OVERRIDE
     {
         Mat frame;
 #ifdef HAVE_OPENCV_VIDEOIO