potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

shape: apply CV_OVERRIDE/CV_FINAL

Browse Source
This commit is contained in:
Alexander Alekhin
2018-03-15 16:17:03 +03:00
parent 4df4a37b11
commit 4a0fa57614
5 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/shape/src/sc_dis.cpp
+30 -30
View File
@@ -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"];