xphoto: apply CV_OVERRIDE/CV_FINAL

modules/xphoto/src/bm3d_denoising_invoker_step1.hpp

@@ -67,7 +67,7 @@ public:
         const float &beta);
 
     virtual ~Bm3dDenoisingInvokerStep1();
-    void operator() (const Range& range) const;
+    void operator() (const Range& range) const CV_OVERRIDE;
 
 private:
     // Unimplemented operator in order to satisfy compiler warning.
@@ -514,4 +514,4 @@ inline void Bm3dDenoisingInvokerStep1<T, D, WT, TT, TC>::calcDistSumsForAllEleme
 }  // namespace xphoto
 }  // namespace cv
 
-#endif
\ No newline at end of file
+#endif

modules/xphoto/src/bm3d_denoising_invoker_step2.hpp

@@ -68,7 +68,7 @@ public:
         const float &beta);
 
     virtual ~Bm3dDenoisingInvokerStep2();
-    void operator() (const Range& range) const;
+    void operator() (const Range& range) const CV_OVERRIDE;
 
 private:
     // Unimplemented operator in order to satisfy compiler warning.
@@ -537,4 +537,4 @@ inline void Bm3dDenoisingInvokerStep2<T, D, WT, TT, TC>::calcDistSumsForAllEleme
 }  // namespace xphoto
 }  // namespace cv
 
-#endif
\ No newline at end of file
+#endif

modules/xphoto/src/dct_image_denoising.cpp

@@ -68,7 +68,7 @@ namespace xphoto
         grayDctDenoisingInvoker(const Mat &src, std::vector <Mat> &patches, const double sigma, const int psize);
         ~grayDctDenoisingInvoker(){};
 
-        void operator() (const Range &range) const;
+        void operator() (const Range &range) const CV_OVERRIDE;
 
     protected:
         const Mat &src;

modules/xphoto/src/grayworld_white_balance.cpp

@@ -49,16 +49,16 @@ namespace xphoto
 void calculateChannelSums(uint &sumB, uint &sumG, uint &sumR, uchar *src_data, int src_len, float thresh);
 void calculateChannelSums(uint64 &sumB, uint64 &sumG, uint64 &sumR, ushort *src_data, int src_len, float thresh);
 
-class GrayworldWBImpl : public GrayworldWB
+class GrayworldWBImpl CV_FINAL : public GrayworldWB
 {
   private:
     float thresh;
 
   public:
     GrayworldWBImpl() { thresh = 0.9f; }
-    float getSaturationThreshold() const { return thresh; }
-    void setSaturationThreshold(float val) { thresh = val; }
-    void balanceWhite(InputArray _src, OutputArray _dst)
+    float getSaturationThreshold() const CV_OVERRIDE { return thresh; }
+    void setSaturationThreshold(float val) CV_OVERRIDE { thresh = val; }
+    void balanceWhite(InputArray _src, OutputArray _dst) CV_OVERRIDE
     {
         CV_Assert(!_src.empty());
         CV_Assert(_src.isContinuous());

modules/xphoto/src/learning_based_color_balance.cpp

@@ -126,16 +126,16 @@ class LearningBasedWBImpl : public LearningBasedWB
         }
     }
 
-    int getRangeMaxVal() const { return range_max_val; }
-    void setRangeMaxVal(int val) { range_max_val = val; }
+    int getRangeMaxVal() const CV_OVERRIDE { return range_max_val; }
+    void setRangeMaxVal(int val) CV_OVERRIDE { range_max_val = val; }
 
-    float getSaturationThreshold() const { return saturation_thresh; }
-    void setSaturationThreshold(float val) { saturation_thresh = val; }
+    float getSaturationThreshold() const CV_OVERRIDE { return saturation_thresh; }
+    void setSaturationThreshold(float val) CV_OVERRIDE { saturation_thresh = val; }
 
-    int getHistBinNum() const { return hist_bin_num; }
-    void setHistBinNum(int val) { hist_bin_num = val; }
+    int getHistBinNum() const CV_OVERRIDE { return hist_bin_num; }
+    void setHistBinNum(int val) CV_OVERRIDE { hist_bin_num = val; }
 
-    void extractSimpleFeatures(InputArray _src, OutputArray _dst)
+    void extractSimpleFeatures(InputArray _src, OutputArray _dst) CV_OVERRIDE
     {
         CV_Assert(!_src.empty());
         CV_Assert(_src.isContinuous());
@@ -149,7 +149,7 @@ class LearningBasedWBImpl : public LearningBasedWB
         Mat(dst).convertTo(_dst, CV_32F);
     }
 
-    void balanceWhite(InputArray _src, OutputArray _dst)
+    void balanceWhite(InputArray _src, OutputArray _dst) CV_OVERRIDE
     {
         CV_Assert(!_src.empty());
         CV_Assert(_src.isContinuous());

modules/xphoto/src/photomontage.hpp

@@ -98,7 +98,7 @@ private:
         ParallelExpansion(Photomontage <Tp> *_main) : main(_main){}
         ~ParallelExpansion(){};
 
-        void operator () (const cv::Range &range) const
+        void operator () (const cv::Range &range) const CV_OVERRIDE
         {
             for (int i = range.start; i <= range.end - 1; ++i)
                 main->distances[i] = main->singleExpansion(i);

modules/xphoto/src/simple_color_balance.cpp

@@ -136,7 +136,7 @@ void balanceWhiteSimple(std::vector<Mat_<T> > &src, Mat &dst, const float inputM
     cv::merge(src, dst);
 }
 
-class SimpleWBImpl : public SimpleWB
+class SimpleWBImpl CV_FINAL : public SimpleWB
 {
   private:
     float inputMin, inputMax, outputMin, outputMax, p;
@@ -151,22 +151,22 @@ class SimpleWBImpl : public SimpleWB
         p = 2.0f;
     }
 
-    float getInputMin() const { return inputMin; }
-    void setInputMin(float val) { inputMin = val; }
+    float getInputMin() const CV_OVERRIDE { return inputMin; }
+    void setInputMin(float val) CV_OVERRIDE { inputMin = val; }
 
-    float getInputMax() const { return inputMax; }
-    void setInputMax(float val) { inputMax = val; }
+    float getInputMax() const CV_OVERRIDE { return inputMax; }
+    void setInputMax(float val) CV_OVERRIDE { inputMax = val; }
 
-    float getOutputMin() const { return outputMin; }
-    void setOutputMin(float val) { outputMin = val; }
+    float getOutputMin() const CV_OVERRIDE { return outputMin; }
+    void setOutputMin(float val) CV_OVERRIDE { outputMin = val; }
 
-    float getOutputMax() const { return outputMax; }
-    void setOutputMax(float val) { outputMax = val; }
+    float getOutputMax() const CV_OVERRIDE { return outputMax; }
+    void setOutputMax(float val) CV_OVERRIDE { outputMax = val; }
 
-    float getP() const { return p; }
-    void setP(float val) { p = val; }
+    float getP() const CV_OVERRIDE { return p; }
+    void setP(float val) CV_OVERRIDE { p = val; }
 
-    void balanceWhite(InputArray _src, OutputArray _dst)
+    void balanceWhite(InputArray _src, OutputArray _dst) CV_OVERRIDE
     {
         CV_Assert(!_src.empty());
         CV_Assert(_src.depth() == CV_8U || _src.depth() == CV_16S || _src.depth() == CV_32S || _src.depth() == CV_32F);