superres: apply CV_OVERRIDE/CV_FINAL

modules/superres/include/opencv2/superres.hpp

@@ -97,8 +97,8 @@ namespace cv
 
             @param frame Output result
              */
-            void nextFrame(OutputArray frame);
-            void reset();
+            void nextFrame(OutputArray frame) CV_OVERRIDE;
+            void reset() CV_OVERRIDE;
 
             /** @brief Clear all inner buffers.
             */

modules/superres/src/btv_l1.cpp

@@ -363,7 +363,7 @@ namespace
     template <typename T>
     struct BtvRegularizationBody : ParallelLoopBody
     {
-        void operator ()(const Range& range) const;
+        void operator ()(const Range& range) const CV_OVERRIDE;
 
         Mat src;
         mutable Mat dst;
@@ -470,18 +470,28 @@ namespace
         void process(InputArrayOfArrays src, OutputArray dst, InputArrayOfArrays forwardMotions,
                      InputArrayOfArrays backwardMotions, int baseIdx);
 
-        void collectGarbage();
-
-        CV_IMPL_PROPERTY(int, Scale, scale_)
-        CV_IMPL_PROPERTY(int, Iterations, iterations_)
-        CV_IMPL_PROPERTY(double, Tau, tau_)
-        CV_IMPL_PROPERTY(double, Labmda, lambda_)
-        CV_IMPL_PROPERTY(double, Alpha, alpha_)
-        CV_IMPL_PROPERTY(int, KernelSize, btvKernelSize_)
-        CV_IMPL_PROPERTY(int, BlurKernelSize, blurKernelSize_)
-        CV_IMPL_PROPERTY(double, BlurSigma, blurSigma_)
-        CV_IMPL_PROPERTY(int, TemporalAreaRadius, temporalAreaRadius_)
-        CV_IMPL_PROPERTY_S(Ptr<cv::superres::DenseOpticalFlowExt>, OpticalFlow, opticalFlow_)
+        void collectGarbage() CV_OVERRIDE;
+
+        inline int getScale() const CV_OVERRIDE { return scale_; }
+        inline void setScale(int val) CV_OVERRIDE { scale_ = val; }
+        inline int getIterations() const CV_OVERRIDE { return iterations_; }
+        inline void setIterations(int val) CV_OVERRIDE { iterations_ = val; }
+        inline double getTau() const CV_OVERRIDE { return tau_; }
+        inline void setTau(double val) CV_OVERRIDE { tau_ = val; }
+        inline double getLabmda() const CV_OVERRIDE { return lambda_; }
+        inline void setLabmda(double val) CV_OVERRIDE { lambda_ = val; }
+        inline double getAlpha() const CV_OVERRIDE { return alpha_; }
+        inline void setAlpha(double val) CV_OVERRIDE { alpha_ = val; }
+        inline int getKernelSize() const CV_OVERRIDE { return btvKernelSize_; }
+        inline void setKernelSize(int val) CV_OVERRIDE { btvKernelSize_ = val; }
+        inline int getBlurKernelSize() const CV_OVERRIDE { return blurKernelSize_; }
+        inline void setBlurKernelSize(int val) CV_OVERRIDE { blurKernelSize_ = val; }
+        inline double getBlurSigma() const CV_OVERRIDE { return blurSigma_; }
+        inline void setBlurSigma(double val) CV_OVERRIDE { blurSigma_ = val; }
+        inline int getTemporalAreaRadius() const CV_OVERRIDE { return temporalAreaRadius_; }
+        inline void setTemporalAreaRadius(int val) CV_OVERRIDE { temporalAreaRadius_ = val; }
+        inline Ptr<cv::superres::DenseOpticalFlowExt> getOpticalFlow() const CV_OVERRIDE { return opticalFlow_; }
+        inline void setOpticalFlow(const Ptr<cv::superres::DenseOpticalFlowExt>& val) CV_OVERRIDE { opticalFlow_ = val; }
 
     protected:
         int scale_;
@@ -798,18 +808,18 @@ namespace
 
 ////////////////////////////////////////////////////////////////////
 
-    class BTVL1 : public BTVL1_Base
+    class BTVL1 CV_FINAL : public BTVL1_Base
     {
     public:
         BTVL1();
 
-        void collectGarbage();
+        void collectGarbage() CV_OVERRIDE;
 
     protected:
-        void initImpl(Ptr<FrameSource>& frameSource);
+        void initImpl(Ptr<FrameSource>& frameSource) CV_OVERRIDE;
         bool ocl_initImpl(Ptr<FrameSource>& frameSource);
 
-        void processImpl(Ptr<FrameSource>& frameSource, OutputArray output);
+        void processImpl(Ptr<FrameSource>& frameSource, OutputArray output) CV_OVERRIDE;
         bool ocl_processImpl(Ptr<FrameSource>& frameSource, OutputArray output);
 
     private:

modules/superres/src/btv_l1_cuda.cpp

@@ -218,16 +218,26 @@ namespace
 
         void collectGarbage();
 
-        CV_IMPL_PROPERTY(int, Scale, scale_)
-        CV_IMPL_PROPERTY(int, Iterations, iterations_)
-        CV_IMPL_PROPERTY(double, Tau, tau_)
-        CV_IMPL_PROPERTY(double, Labmda, lambda_)
-        CV_IMPL_PROPERTY(double, Alpha, alpha_)
-        CV_IMPL_PROPERTY(int, KernelSize, btvKernelSize_)
-        CV_IMPL_PROPERTY(int, BlurKernelSize, blurKernelSize_)
-        CV_IMPL_PROPERTY(double, BlurSigma, blurSigma_)
-        CV_IMPL_PROPERTY(int, TemporalAreaRadius, temporalAreaRadius_)
-        CV_IMPL_PROPERTY_S(Ptr<cv::superres::DenseOpticalFlowExt>, OpticalFlow, opticalFlow_)
+        inline int getScale() const CV_OVERRIDE { return scale_; }
+        inline void setScale(int val) CV_OVERRIDE { scale_ = val; }
+        inline int getIterations() const CV_OVERRIDE { return iterations_; }
+        inline void setIterations(int val) CV_OVERRIDE { iterations_ = val; }
+        inline double getTau() const CV_OVERRIDE { return tau_; }
+        inline void setTau(double val) CV_OVERRIDE { tau_ = val; }
+        inline double getLabmda() const CV_OVERRIDE { return lambda_; }
+        inline void setLabmda(double val) CV_OVERRIDE { lambda_ = val; }
+        inline double getAlpha() const CV_OVERRIDE { return alpha_; }
+        inline void setAlpha(double val) CV_OVERRIDE { alpha_ = val; }
+        inline int getKernelSize() const CV_OVERRIDE { return btvKernelSize_; }
+        inline void setKernelSize(int val) CV_OVERRIDE { btvKernelSize_ = val; }
+        inline int getBlurKernelSize() const CV_OVERRIDE { return blurKernelSize_; }
+        inline void setBlurKernelSize(int val) CV_OVERRIDE { blurKernelSize_ = val; }
+        inline double getBlurSigma() const CV_OVERRIDE { return blurSigma_; }
+        inline void setBlurSigma(double val) CV_OVERRIDE { blurSigma_ = val; }
+        inline int getTemporalAreaRadius() const CV_OVERRIDE { return temporalAreaRadius_; }
+        inline void setTemporalAreaRadius(int val) CV_OVERRIDE { temporalAreaRadius_ = val; }
+        inline Ptr<cv::superres::DenseOpticalFlowExt> getOpticalFlow() const CV_OVERRIDE { return opticalFlow_; }
+        inline void setOpticalFlow(const Ptr<cv::superres::DenseOpticalFlowExt>& val) CV_OVERRIDE { opticalFlow_ = val; }
 
     protected:
         int scale_;

modules/superres/src/frame_source.cpp

@@ -58,8 +58,8 @@ namespace
     class EmptyFrameSource : public FrameSource
     {
     public:
-        void nextFrame(OutputArray frame);
-        void reset();
+        void nextFrame(OutputArray frame) CV_OVERRIDE;
+        void reset() CV_OVERRIDE;
     };
 
     void EmptyFrameSource::nextFrame(OutputArray frame)
@@ -103,7 +103,7 @@ namespace
     class CaptureFrameSource : public FrameSource
     {
     public:
-        void nextFrame(OutputArray frame);
+        void nextFrame(OutputArray frame) CV_OVERRIDE;
 
     protected:
         VideoCapture vc_;
@@ -135,7 +135,7 @@ namespace
     public:
         VideoFrameSource(const String& fileName);
 
-        void reset();
+        void reset() CV_OVERRIDE;
 
     private:
         String fileName_;
@@ -158,7 +158,7 @@ namespace
     public:
         CameraFrameSource(int deviceId);
 
-        void reset();
+        void reset() CV_OVERRIDE;
 
     private:
         int deviceId_;