Skip to content

O
opencv_contrib
Commit 3dd79d68 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

reg: apply CV_OVERRIDE/CV_FINAL

parent 0a00743e
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
modules/reg/include/opencv2/reg/mapaffine.hpp
View file @ 3dd79d68
...@@ -69,13 +69,13 @@ public: ...@@ -69,13 +69,13 @@ public:
*/ */
~MapAffine(); ~MapAffine();
CV_WRAP void inverseWarp(InputArray img1, OutputArray img2) const; CV_WRAP void inverseWarp(InputArray img1, OutputArray img2) const CV_OVERRIDE;
CV_WRAP cv::Ptr<Map> inverseMap() const; CV_WRAP cv::Ptr<Map> inverseMap() const CV_OVERRIDE;
CV_WRAP void compose(cv::Ptr<Map> map); CV_WRAP void compose(cv::Ptr<Map> map) CV_OVERRIDE;
CV_WRAP void scale(double factor); CV_WRAP void scale(double factor) CV_OVERRIDE;
/*! /*!
* Return linear part of the affine transformation * Return linear part of the affine transformation
......
modules/reg/include/opencv2/reg/mappergradaffine.hpp
View file @ 3dd79d68
...@@ -55,9 +55,9 @@ public: ...@@ -55,9 +55,9 @@ public:
CV_WRAP MapperGradAffine(); CV_WRAP MapperGradAffine();
~MapperGradAffine(void); ~MapperGradAffine(void);
CV_WRAP virtual cv::Ptr<Map> calculate(InputArray img1, InputArray img2, cv::Ptr<Map> init = cv::Ptr<Map>()) const; CV_WRAP virtual cv::Ptr<Map> calculate(InputArray img1, InputArray img2, cv::Ptr<Map> init = cv::Ptr<Map>()) const CV_OVERRIDE;
CV_WRAP cv::Ptr<Map> getMap() const; CV_WRAP cv::Ptr<Map> getMap() const CV_OVERRIDE;
}; };
//! @} //! @}
......
modules/reg/include/opencv2/reg/mappergradeuclid.hpp
View file @ 3dd79d68
...@@ -55,9 +55,9 @@ public: ...@@ -55,9 +55,9 @@ public:
CV_WRAP MapperGradEuclid(); CV_WRAP MapperGradEuclid();
~MapperGradEuclid(); ~MapperGradEuclid();
CV_WRAP virtual cv::Ptr<Map> calculate(InputArray img1, InputArray img2, cv::Ptr<Map> init = cv::Ptr<Map>()) const; CV_WRAP virtual cv::Ptr<Map> calculate(InputArray img1, InputArray img2, cv::Ptr<Map> init = cv::Ptr<Map>()) const CV_OVERRIDE;
CV_WRAP cv::Ptr<Map> getMap() const; CV_WRAP cv::Ptr<Map> getMap() const CV_OVERRIDE;
}; };
//! @} //! @}
......
modules/reg/include/opencv2/reg/mappergradproj.hpp
View file @ 3dd79d68
...@@ -55,9 +55,9 @@ public: ...@@ -55,9 +55,9 @@ public:
CV_WRAP MapperGradProj(); CV_WRAP MapperGradProj();
~MapperGradProj(); ~MapperGradProj();
CV_WRAP virtual cv::Ptr<Map> calculate(InputArray img1, InputArray img2, cv::Ptr<Map> init = cv::Ptr<Map>()) const; CV_WRAP virtual cv::Ptr<Map> calculate(InputArray img1, InputArray img2, cv::Ptr<Map> init = cv::Ptr<Map>()) const CV_OVERRIDE;
CV_WRAP cv::Ptr<Map> getMap() const; CV_WRAP cv::Ptr<Map> getMap() const CV_OVERRIDE;
}; };
//! @} //! @}
......
modules/reg/include/opencv2/reg/mappergradshift.hpp
View file @ 3dd79d68
...@@ -55,9 +55,9 @@ public: ...@@ -55,9 +55,9 @@ public:
CV_WRAP MapperGradShift(); CV_WRAP MapperGradShift();
virtual ~MapperGradShift(); virtual ~MapperGradShift();
CV_WRAP virtual cv::Ptr<Map> calculate(InputArray img1, InputArray img2, cv::Ptr<Map> init = cv::Ptr<Map>()) const; CV_WRAP virtual cv::Ptr<Map> calculate(InputArray img1, InputArray img2, cv::Ptr<Map> init = cv::Ptr<Map>()) const CV_OVERRIDE;
CV_WRAP cv::Ptr<Map> getMap() const; CV_WRAP cv::Ptr<Map> getMap() const CV_OVERRIDE;
}; };
//! @} //! @}
......
modules/reg/include/opencv2/reg/mappergradsimilar.hpp
View file @ 3dd79d68
...@@ -55,9 +55,9 @@ public: ...@@ -55,9 +55,9 @@ public:
CV_WRAP MapperGradSimilar(); CV_WRAP MapperGradSimilar();
~MapperGradSimilar(); ~MapperGradSimilar();
CV_WRAP virtual cv::Ptr<Map> calculate(InputArray img1, InputArray img2, cv::Ptr<Map> init = cv::Ptr<Map>()) const; CV_WRAP virtual cv::Ptr<Map> calculate(InputArray img1, InputArray img2, cv::Ptr<Map> init = cv::Ptr<Map>()) const CV_OVERRIDE;
CV_WRAP cv::Ptr<Map> getMap() const; CV_WRAP cv::Ptr<Map> getMap() const CV_OVERRIDE;
}; };
//! @} //! @}
......
modules/reg/include/opencv2/reg/mapperpyramid.hpp
View file @ 3dd79d68
...@@ -61,9 +61,9 @@ public: ...@@ -61,9 +61,9 @@ public:
*/ */
CV_WRAP MapperPyramid(Ptr<Mapper> baseMapper); CV_WRAP MapperPyramid(Ptr<Mapper> baseMapper);
CV_WRAP virtual cv::Ptr<Map> calculate(InputArray img1, InputArray img2, cv::Ptr<Map> init = cv::Ptr<Map>()) const; CV_WRAP virtual cv::Ptr<Map> calculate(InputArray img1, InputArray img2, cv::Ptr<Map> init = cv::Ptr<Map>()) const CV_OVERRIDE;
CV_WRAP cv::Ptr<Map> getMap() const; CV_WRAP cv::Ptr<Map> getMap() const CV_OVERRIDE;
CV_PROP_RW int numLev_; /*!< Number of levels of the pyramid */ CV_PROP_RW int numLev_; /*!< Number of levels of the pyramid */
CV_PROP_RW int numIterPerScale_; /*!< Number of iterations at a given scale of the pyramid */ CV_PROP_RW int numIterPerScale_; /*!< Number of iterations at a given scale of the pyramid */
......
modules/reg/include/opencv2/reg/mapprojec.hpp
View file @ 3dd79d68
...@@ -69,13 +69,13 @@ public: ...@@ -69,13 +69,13 @@ public:
*/ */
~MapProjec(); ~MapProjec();
CV_WRAP void inverseWarp(InputArray img1, OutputArray img2) const; CV_WRAP void inverseWarp(InputArray img1, OutputArray img2) const CV_OVERRIDE;
CV_WRAP cv::Ptr<Map> inverseMap() const; CV_WRAP cv::Ptr<Map> inverseMap() const CV_OVERRIDE;
CV_WRAP void compose(cv::Ptr<Map> map); CV_WRAP void compose(cv::Ptr<Map> map) CV_OVERRIDE;
CV_WRAP void scale(double factor); CV_WRAP void scale(double factor) CV_OVERRIDE;
/*! /*!
* Returns projection matrix * Returns projection matrix
......
modules/reg/include/opencv2/reg/mapshift.hpp
View file @ 3dd79d68
...@@ -70,13 +70,13 @@ public: ...@@ -70,13 +70,13 @@ public:
*/ */
~MapShift(); ~MapShift();
CV_WRAP void inverseWarp(InputArray img1, OutputArray img2) const; CV_WRAP void inverseWarp(InputArray img1, OutputArray img2) const CV_OVERRIDE;
CV_WRAP cv::Ptr<Map> inverseMap() const; CV_WRAP cv::Ptr<Map> inverseMap() const CV_OVERRIDE;
CV_WRAP void compose(cv::Ptr<Map> map); CV_WRAP void compose(cv::Ptr<Map> map) CV_OVERRIDE;
CV_WRAP void scale(double factor); CV_WRAP void scale(double factor) CV_OVERRIDE;
/*! /*!
* Return displacement * Return displacement
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment