shape: apply CV_OVERRIDE/CV_FINAL

modules/shape/src/aff_trans.cpp

@@ -69,24 +69,24 @@ public:
     }
 
     //! the main operator
-    virtual void estimateTransformation(InputArray transformingShape, InputArray targetShape, std::vector<DMatch> &matches);
-    virtual float applyTransformation(InputArray input, OutputArray output=noArray());
+    virtual void estimateTransformation(InputArray transformingShape, InputArray targetShape, std::vector<DMatch> &matches) CV_OVERRIDE;
+    virtual float applyTransformation(InputArray input, OutputArray output=noArray()) CV_OVERRIDE;
     virtual void warpImage(InputArray transformingImage, OutputArray output,
-                           int flags, int borderMode, const Scalar& borderValue) const;
+                           int flags, int borderMode, const Scalar& borderValue) const CV_OVERRIDE;
 
     //! Setters/Getters
-    virtual void setFullAffine(bool _fullAffine) {fullAffine=_fullAffine;}
-    virtual bool getFullAffine() const {return fullAffine;}
+    virtual void setFullAffine(bool _fullAffine) CV_OVERRIDE {fullAffine=_fullAffine;}
+    virtual bool getFullAffine() const CV_OVERRIDE {return fullAffine;}
 
     //! write/read
-    virtual void write(FileStorage& fs) const
+    virtual void write(FileStorage& fs) const CV_OVERRIDE
     {
         writeFormat(fs);
         fs << "name" << name_
            << "affine_type" << int(fullAffine);
     }
 
-    virtual void read(const FileNode& fn)
+    virtual void read(const FileNode& fn) CV_OVERRIDE
     {
         CV_Assert( (String)fn["name"] == name_ );
         fullAffine = int(fn["affine_type"])?true:false;

modules/shape/src/haus_dis.cpp

@@ -44,7 +44,7 @@
 namespace cv
 {
 
-class HausdorffDistanceExtractorImpl : public HausdorffDistanceExtractor
+class HausdorffDistanceExtractorImpl CV_FINAL : public HausdorffDistanceExtractor
 {
 public:
     /* Constructor */
@@ -61,21 +61,21 @@ public:
     }
 
     //! the main operator
-    virtual float computeDistance(InputArray contour1, InputArray contour2);
+    virtual float computeDistance(InputArray contour1, InputArray contour2) CV_OVERRIDE;
 
     //! Setters/Getters
-    virtual void setDistanceFlag(int _distanceFlag) {distanceFlag=_distanceFlag;}
-    virtual int getDistanceFlag() const {return distanceFlag;}
+    virtual void setDistanceFlag(int _distanceFlag) CV_OVERRIDE {distanceFlag=_distanceFlag;}
+    virtual int getDistanceFlag() const CV_OVERRIDE {return distanceFlag;}
 
-    virtual void setRankProportion(float _rankProportion)
+    virtual void setRankProportion(float _rankProportion) CV_OVERRIDE
     {
         CV_Assert((_rankProportion>0) && (_rankProportion<=1));
         rankProportion=_rankProportion;
     }
-    virtual float getRankProportion() const {return rankProportion;}
+    virtual float getRankProportion() const CV_OVERRIDE {return rankProportion;}
 
     //! write/read
-    virtual void write(FileStorage& fs) const
+    virtual void write(FileStorage& fs) const CV_OVERRIDE
     {
         writeFormat(fs);
         fs << "name" << name_
@@ -83,7 +83,7 @@ public:
            << "rank" << rankProportion;
     }
 
-    virtual void read(const FileNode& fn)
+    virtual void read(const FileNode& fn) CV_OVERRIDE
     {
         CV_Assert( (String)fn["name"] == name_ );
         distanceFlag = (int)fn["distance"];

modules/shape/src/hist_cost.cpp

@@ -45,7 +45,7 @@ namespace cv
 {
 
 /*!  */
-class NormHistogramCostExtractorImpl : public NormHistogramCostExtractor
+class NormHistogramCostExtractorImpl CV_FINAL : public NormHistogramCostExtractor
 {
 public:
     /* Constructors */
@@ -58,46 +58,46 @@ public:
     }
 
     /* Destructor */
-    ~NormHistogramCostExtractorImpl()
+    ~NormHistogramCostExtractorImpl() CV_OVERRIDE
     {
     }
 
     //! the main operator
-    virtual void buildCostMatrix(InputArray descriptors1, InputArray descriptors2, OutputArray costMatrix);
+    virtual void buildCostMatrix(InputArray descriptors1, InputArray descriptors2, OutputArray costMatrix) CV_OVERRIDE;
 
     //! Setters/Getters
-    void setNDummies(int _nDummies)
+    void setNDummies(int _nDummies) CV_OVERRIDE
     {
         nDummies=_nDummies;
     }
 
-    int getNDummies() const
+    int getNDummies() const CV_OVERRIDE
     {
         return nDummies;
     }
 
-    void setDefaultCost(float _defaultCost)
+    void setDefaultCost(float _defaultCost) CV_OVERRIDE
     {
         defaultCost=_defaultCost;
     }
 
-    float getDefaultCost() const
+    float getDefaultCost() const CV_OVERRIDE
     {
         return defaultCost;
     }
 
-    virtual void setNormFlag(int _flag)
+    virtual void setNormFlag(int _flag) CV_OVERRIDE
     {
         flag=_flag;
     }
 
-    virtual int getNormFlag() const
+    virtual int getNormFlag() const CV_OVERRIDE
     {
         return flag;
     }
 
     //! write/read
-    virtual void write(FileStorage& fs) const
+    virtual void write(FileStorage& fs) const CV_OVERRIDE
     {
         writeFormat(fs);
         fs << "name" << name_
@@ -106,7 +106,7 @@ public:
            << "default" << defaultCost;
     }
 
-    virtual void read(const FileNode& fn)
+    virtual void read(const FileNode& fn) CV_OVERRIDE
     {
         CV_Assert( (String)fn["name"] == name_ );
         flag = (int)fn["flag"];
@@ -173,7 +173,7 @@ Ptr <HistogramCostExtractor> createNormHistogramCostExtractor(int flag, int nDum
 }
 
 /*!  */
-class EMDHistogramCostExtractorImpl : public EMDHistogramCostExtractor
+class EMDHistogramCostExtractorImpl CV_FINAL : public EMDHistogramCostExtractor
 {
 public:
     /* Constructors */
@@ -186,46 +186,46 @@ public:
     }
 
     /* Destructor */
-    ~EMDHistogramCostExtractorImpl()
+    ~EMDHistogramCostExtractorImpl() CV_OVERRIDE
     {
     }
 
     //! the main operator
-    virtual void buildCostMatrix(InputArray descriptors1, InputArray descriptors2, OutputArray costMatrix);
+    virtual void buildCostMatrix(InputArray descriptors1, InputArray descriptors2, OutputArray costMatrix) CV_OVERRIDE;
 
     //! Setters/Getters
-    void setNDummies(int _nDummies)
+    void setNDummies(int _nDummies) CV_OVERRIDE
     {
         nDummies=_nDummies;
     }
 
-    int getNDummies() const
+    int getNDummies() const CV_OVERRIDE
     {
         return nDummies;
     }
 
-    void setDefaultCost(float _defaultCost)
+    void setDefaultCost(float _defaultCost) CV_OVERRIDE
     {
         defaultCost=_defaultCost;
     }
 
-    float getDefaultCost() const
+    float getDefaultCost() const CV_OVERRIDE
     {
         return defaultCost;
     }
 
-    virtual void setNormFlag(int _flag)
+    virtual void setNormFlag(int _flag) CV_OVERRIDE
     {
         flag=_flag;
     }
 
-    virtual int getNormFlag() const
+    virtual int getNormFlag() const CV_OVERRIDE
     {
         return flag;
     }
 
     //! write/read
-    virtual void write(FileStorage& fs) const
+    virtual void write(FileStorage& fs) const CV_OVERRIDE
     {
         writeFormat(fs);
         fs << "name" << name_
@@ -234,7 +234,7 @@ public:
            << "default" << defaultCost;
     }
 
-    virtual void read(const FileNode& fn)
+    virtual void read(const FileNode& fn) CV_OVERRIDE
     {
         CV_Assert( (String)fn["name"] == name_ );
         flag = (int)fn["flag"];
@@ -313,7 +313,7 @@ Ptr <HistogramCostExtractor> createEMDHistogramCostExtractor(int flag, int nDumm
 }
 
 /*!  */
-class ChiHistogramCostExtractorImpl : public ChiHistogramCostExtractor
+class ChiHistogramCostExtractorImpl CV_FINAL : public ChiHistogramCostExtractor
 {
 public:
     /* Constructors */
@@ -325,36 +325,36 @@ public:
     }
 
     /* Destructor */
-    ~ChiHistogramCostExtractorImpl()
+    ~ChiHistogramCostExtractorImpl() CV_OVERRIDE
     {
     }
 
     //! the main operator
-    virtual void buildCostMatrix(InputArray descriptors1, InputArray descriptors2, OutputArray costMatrix);
+    virtual void buildCostMatrix(InputArray descriptors1, InputArray descriptors2, OutputArray costMatrix) CV_OVERRIDE;
 
     //! setters / getters
-    void setNDummies(int _nDummies)
+    void setNDummies(int _nDummies) CV_OVERRIDE
     {
         nDummies=_nDummies;
     }
 
-    int getNDummies() const
+    int getNDummies() const CV_OVERRIDE
     {
         return nDummies;
     }
 
-    void setDefaultCost(float _defaultCost)
+    void setDefaultCost(float _defaultCost) CV_OVERRIDE
     {
         defaultCost=_defaultCost;
     }
 
-    float getDefaultCost() const
+    float getDefaultCost() const CV_OVERRIDE
     {
         return defaultCost;
     }
 
     //! write/read
-    virtual void write(FileStorage& fs) const
+    virtual void write(FileStorage& fs) const CV_OVERRIDE
     {
         writeFormat(fs);
         fs << "name" << name_
@@ -362,7 +362,7 @@ public:
            << "default" << defaultCost;
     }
 
-    virtual void read(const FileNode& fn)
+    virtual void read(const FileNode& fn) CV_OVERRIDE
     {
         CV_Assert( (String)fn["name"] == name_ );
         nDummies = (int)fn["dummies"];
@@ -432,7 +432,7 @@ Ptr <HistogramCostExtractor> createChiHistogramCostExtractor(int nDummies, float
 }
 
 /*!  */
-class EMDL1HistogramCostExtractorImpl : public EMDL1HistogramCostExtractor
+class EMDL1HistogramCostExtractorImpl CV_FINAL : public EMDL1HistogramCostExtractor
 {
 public:
     /* Constructors */
@@ -444,36 +444,36 @@ public:
     }
 
     /* Destructor */
-    ~EMDL1HistogramCostExtractorImpl()
+    ~EMDL1HistogramCostExtractorImpl() CV_OVERRIDE
     {
     }
 
     //! the main operator
-    virtual void buildCostMatrix(InputArray descriptors1, InputArray descriptors2, OutputArray costMatrix);
+    virtual void buildCostMatrix(InputArray descriptors1, InputArray descriptors2, OutputArray costMatrix) CV_OVERRIDE;
 
     //! setters / getters
-    void setNDummies(int _nDummies)
+    void setNDummies(int _nDummies) CV_OVERRIDE
     {
         nDummies=_nDummies;
     }
 
-    int getNDummies() const
+    int getNDummies() const CV_OVERRIDE
     {
         return nDummies;
     }
 
-    void setDefaultCost(float _defaultCost)
+    void setDefaultCost(float _defaultCost) CV_OVERRIDE
     {
         defaultCost=_defaultCost;
     }
 
-    float getDefaultCost() const
+    float getDefaultCost() const CV_OVERRIDE
     {
         return defaultCost;
     }
 
     //! write/read
-    virtual void write(FileStorage& fs) const
+    virtual void write(FileStorage& fs) const CV_OVERRIDE
     {
         writeFormat(fs);
         fs << "name" << name_
@@ -481,7 +481,7 @@ public:
            << "default" << defaultCost;
     }
 
-    virtual void read(const FileNode& fn)
+    virtual void read(const FileNode& fn) CV_OVERRIDE
     {
         CV_Assert( (String)fn["name"] == name_ );
         nDummies = (int)fn["dummies"];

modules/shape/src/sc_dis.cpp

@@ -76,45 +76,45 @@ public:
     }
 
     /* Destructor */
-    ~ShapeContextDistanceExtractorImpl()
+    ~ShapeContextDistanceExtractorImpl() CV_OVERRIDE
     {
     }
 
     //! the main operator
-    virtual float computeDistance(InputArray contour1, InputArray contour2);
+    virtual float computeDistance(InputArray contour1, InputArray contour2) CV_OVERRIDE;
 
     //! Setters/Getters
-    virtual void setAngularBins(int _nAngularBins){CV_Assert(_nAngularBins>0); nAngularBins=_nAngularBins;}
-    virtual int getAngularBins() const {return nAngularBins;}
+    virtual void setAngularBins(int _nAngularBins) CV_OVERRIDE { CV_Assert(_nAngularBins>0); nAngularBins=_nAngularBins; }
+    virtual int getAngularBins() const CV_OVERRIDE { return nAngularBins; }
 
-    virtual void setRadialBins(int _nRadialBins){CV_Assert(_nRadialBins>0); nRadialBins=_nRadialBins;}
-    virtual int getRadialBins() const {return nRadialBins;}
+    virtual void setRadialBins(int _nRadialBins) CV_OVERRIDE { CV_Assert(_nRadialBins>0); nRadialBins=_nRadialBins; }
+    virtual int getRadialBins() const CV_OVERRIDE { return nRadialBins; }
 
-    virtual void setInnerRadius(float _innerRadius) {CV_Assert(_innerRadius>0); innerRadius=_innerRadius;}
-    virtual float getInnerRadius() const {return innerRadius;}
+    virtual void setInnerRadius(float _innerRadius) CV_OVERRIDE { CV_Assert(_innerRadius>0); innerRadius=_innerRadius; }
+    virtual float getInnerRadius() const CV_OVERRIDE { return innerRadius; }
 
-    virtual void setOuterRadius(float _outerRadius) {CV_Assert(_outerRadius>0); outerRadius=_outerRadius;}
-    virtual float getOuterRadius() const {return outerRadius;}
+    virtual void setOuterRadius(float _outerRadius) CV_OVERRIDE { CV_Assert(_outerRadius>0); outerRadius=_outerRadius; }
+    virtual float getOuterRadius() const CV_OVERRIDE { return outerRadius; }
 
-    virtual void setRotationInvariant(bool _rotationInvariant) {rotationInvariant=_rotationInvariant;}
-    virtual bool getRotationInvariant() const {return rotationInvariant;}
+    virtual void setRotationInvariant(bool _rotationInvariant) CV_OVERRIDE { rotationInvariant=_rotationInvariant; }
+    virtual bool getRotationInvariant() const CV_OVERRIDE { return rotationInvariant; }
 
-    virtual void setCostExtractor(Ptr<HistogramCostExtractor> _comparer) { comparer = _comparer; }
-    virtual Ptr<HistogramCostExtractor> getCostExtractor() const { return comparer; }
+    virtual void setCostExtractor(Ptr<HistogramCostExtractor> _comparer) CV_OVERRIDE { comparer = _comparer; }
+    virtual Ptr<HistogramCostExtractor> getCostExtractor() const CV_OVERRIDE { return comparer; }
 
-    virtual void setShapeContextWeight(float _shapeContextWeight) {shapeContextWeight=_shapeContextWeight;}
-    virtual float getShapeContextWeight() const {return shapeContextWeight;}
+    virtual void setShapeContextWeight(float _shapeContextWeight) CV_OVERRIDE { shapeContextWeight=_shapeContextWeight; }
+    virtual float getShapeContextWeight() const CV_OVERRIDE { return shapeContextWeight; }
 
-    virtual void setImageAppearanceWeight(float _imageAppearanceWeight) {imageAppearanceWeight=_imageAppearanceWeight;}
-    virtual float getImageAppearanceWeight() const {return imageAppearanceWeight;}
+    virtual void setImageAppearanceWeight(float _imageAppearanceWeight) CV_OVERRIDE { imageAppearanceWeight=_imageAppearanceWeight; }
+    virtual float getImageAppearanceWeight() const CV_OVERRIDE { return imageAppearanceWeight; }
 
-    virtual void setBendingEnergyWeight(float _bendingEnergyWeight) {bendingEnergyWeight=_bendingEnergyWeight;}
-    virtual float getBendingEnergyWeight() const {return bendingEnergyWeight;}
+    virtual void setBendingEnergyWeight(float _bendingEnergyWeight) CV_OVERRIDE { bendingEnergyWeight=_bendingEnergyWeight; }
+    virtual float getBendingEnergyWeight() const CV_OVERRIDE { return bendingEnergyWeight; }
 
-    virtual void setStdDev(float _sigma) {sigma=_sigma;}
-    virtual float getStdDev() const {return sigma;}
+    virtual void setStdDev(float _sigma) CV_OVERRIDE { sigma=_sigma; }
+    virtual float getStdDev() const CV_OVERRIDE { return sigma; }
 
-    virtual void setImages(InputArray _image1, InputArray _image2)
+    virtual void setImages(InputArray _image1, InputArray _image2) CV_OVERRIDE
     {
         Mat image1_=_image1.getMat(), image2_=_image2.getMat();
         CV_Assert((image1_.depth()==0) && (image2_.depth()==0));
@@ -122,21 +122,21 @@ public:
         image2=image2_;
     }
 
-    virtual void getImages(OutputArray _image1, OutputArray _image2) const
+    virtual void getImages(OutputArray _image1, OutputArray _image2) const CV_OVERRIDE
     {
         CV_Assert((!image1.empty()) && (!image2.empty()));
         image1.copyTo(_image1);
         image2.copyTo(_image2);
     }
 
-    virtual void setIterations(int _iterations) {CV_Assert(_iterations>0); iterations=_iterations;}
-    virtual int getIterations() const {return iterations;}
+    virtual void setIterations(int _iterations) CV_OVERRIDE {CV_Assert(_iterations>0); iterations=_iterations;}
+    virtual int getIterations() const CV_OVERRIDE {return iterations;}
 
-    virtual void setTransformAlgorithm(Ptr<ShapeTransformer> _transformer) {transformer=_transformer;}
-    virtual Ptr<ShapeTransformer> getTransformAlgorithm() const {return transformer;}
+    virtual void setTransformAlgorithm(Ptr<ShapeTransformer> _transformer) CV_OVERRIDE {transformer=_transformer;}
+    virtual Ptr<ShapeTransformer> getTransformAlgorithm() const CV_OVERRIDE {return transformer;}
 
     //! write/read
-    virtual void write(FileStorage& fs) const
+    virtual void write(FileStorage& fs) const CV_OVERRIDE
     {
         writeFormat(fs);
         fs << "name" << name_
@@ -153,7 +153,7 @@ public:
            << "sigma" << sigma;
     }
 
-    virtual void read(const FileNode& fn)
+    virtual void read(const FileNode& fn) CV_OVERRIDE
     {
         CV_Assert( (String)fn["name"] == name_ );
         nRadialBins = (int)fn["nRads"];

modules/shape/src/tps_trans.cpp

@@ -45,7 +45,7 @@
 namespace cv
 {
 
-class ThinPlateSplineShapeTransformerImpl : public ThinPlateSplineShapeTransformer
+class ThinPlateSplineShapeTransformerImpl CV_FINAL : public ThinPlateSplineShapeTransformer
 {
 public:
     /* Constructors */
@@ -66,29 +66,29 @@ public:
     }
 
     /* Destructor */
-    ~ThinPlateSplineShapeTransformerImpl()
+    ~ThinPlateSplineShapeTransformerImpl() CV_OVERRIDE
     {
     }
 
     //! the main operators
-    virtual void estimateTransformation(InputArray transformingShape, InputArray targetShape, std::vector<DMatch> &matches);
-    virtual float applyTransformation(InputArray inPts, OutputArray output=noArray());
+    virtual void estimateTransformation(InputArray transformingShape, InputArray targetShape, std::vector<DMatch> &matches) CV_OVERRIDE;
+    virtual float applyTransformation(InputArray inPts, OutputArray output=noArray()) CV_OVERRIDE;
     virtual void warpImage(InputArray transformingImage, OutputArray output,
-                           int flags, int borderMode, const Scalar& borderValue) const;
+                           int flags, int borderMode, const Scalar& borderValue) const CV_OVERRIDE;
 
     //! Setters/Getters
-    virtual void setRegularizationParameter(double _regularizationParameter) {regularizationParameter=_regularizationParameter;}
-    virtual double getRegularizationParameter() const {return regularizationParameter;}
+    virtual void setRegularizationParameter(double _regularizationParameter) CV_OVERRIDE { regularizationParameter=_regularizationParameter; }
+    virtual double getRegularizationParameter() const CV_OVERRIDE { return regularizationParameter; }
 
     //! write/read
-    virtual void write(FileStorage& fs) const
+    virtual void write(FileStorage& fs) const CV_OVERRIDE
     {
         writeFormat(fs);
         fs << "name" << name_
            << "regularization" << regularizationParameter;
     }
 
-    virtual void read(const FileNode& fn)
+    virtual void read(const FileNode& fn) CV_OVERRIDE
     {
         CV_Assert( (String)fn["name"] == name_ );
         regularizationParameter = (int)fn["regularization"];