third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[move sift.cpp] xfeatures2d: apply CV_OVERRIDE/CV_FINAL

Browse Source 
original commit: https://github.com/opencv/opencv_contrib/commit/ec65e5b29c1c4928aee3d56a44bb399d4af6b61a
This commit is contained in:
Alexander Alekhin
2018-03-21 16:58:22 +03:00
parent c5f06814bc
commit 9badb0d903
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/features2d/src/sift.cpp
+7 -7
View File
@@ -90,20 +90,20 @@ public:
double sigma = 1.6);
//! returns the descriptor size in floats (128)
int descriptorSize() const;
int descriptorSize() const CV_OVERRIDE;
//! returns the descriptor type
int descriptorType() const;
int descriptorType() const CV_OVERRIDE;
//! returns the default norm type
int defaultNorm() const;
int defaultNorm() const CV_OVERRIDE;
//! finds the keypoints and computes descriptors for them using SIFT algorithm.
//! Optionally it can compute descriptors for the user-provided keypoints
void detectAndCompute(InputArray img, InputArray mask,
std::vector<KeyPoint>& keypoints,
OutputArray descriptors,
bool useProvidedKeypoints = false);
bool useProvidedKeypoints = false) CV_OVERRIDE;
void buildGaussianPyramid( const Mat& base, std::vector<Mat>& pyr, int nOctaves ) const;
void buildDoGPyramid( const std::vector<Mat>& pyr, std::vector<Mat>& dogpyr ) const;
@@ -267,7 +267,7 @@ public:
gpyr(_gpyr),
dogpyr(_dogpyr) { }
void operator()( const cv::Range& range ) const
void operator()( const cv::Range& range ) const CV_OVERRIDE
{
const int begin = range.start;
const int end = range.end;
@@ -570,7 +570,7 @@ public:
gauss_pyr(_gauss_pyr),
dog_pyr(_dog_pyr),
tls_kpts_struct(_tls_kpts_struct) { }
void operator()( const cv::Range& range ) const
void operator()( const cv::Range& range ) const CV_OVERRIDE
{
const int begin = range.start;
const int end = range.end;
@@ -1011,7 +1011,7 @@ public:
nOctaveLayers(_nOctaveLayers),
firstOctave(_firstOctave) { }
void operator()( const cv::Range& range ) const
void operator()( const cv::Range& range ) const CV_OVERRIDE
{
const int begin = range.start;
const int end = range.end;