diff --git a/modules/objdetect/include/opencv2/objdetect.hpp b/modules/objdetect/include/opencv2/objdetect.hpp index 5c6c221afa8755dc7c3981955e5cfd001f6f3721..eac9cbaf58b78d8d51d3af2d537fb064e6118919 100644 --- a/modules/objdetect/include/opencv2/objdetect.hpp +++ b/modules/objdetect/include/opencv2/objdetect.hpp @@ -175,7 +175,7 @@ class CV_EXPORTS_W BaseCascadeClassifier : public Algorithm { public: virtual ~BaseCascadeClassifier(); - virtual bool empty() const = 0; + virtual bool empty() const CV_OVERRIDE = 0; virtual bool load( const String& filename ) = 0; virtual void detectMultiScale( InputArray image, CV_OUT std::vector& objects, diff --git a/modules/objdetect/src/cascadedetect.cpp b/modules/objdetect/src/cascadedetect.cpp index d05c47e06b053d43828833da3993bd76860771ab..6c98eb9299f50829cd71f0bdd46467f8f184a4ad 100644 --- a/modules/objdetect/src/cascadedetect.cpp +++ b/modules/objdetect/src/cascadedetect.cpp @@ -997,7 +997,7 @@ public: mtx = _mtx; } - void operator()(const Range& range) const + void operator()(const Range& range) const CV_OVERRIDE { CV_INSTRUMENT_REGION() diff --git a/modules/objdetect/src/cascadedetect.hpp b/modules/objdetect/src/cascadedetect.hpp index a69dcad3f3ff51ba3fc19b4784b2a5cb2922760f..b19bc1c57fa7576e3de10018faec5622d6a2e8da 100644 --- a/modules/objdetect/src/cascadedetect.hpp +++ b/modules/objdetect/src/cascadedetect.hpp @@ -74,22 +74,22 @@ protected: }; -class CascadeClassifierImpl : public BaseCascadeClassifier +class CascadeClassifierImpl CV_FINAL : public BaseCascadeClassifier { public: CascadeClassifierImpl(); - virtual ~CascadeClassifierImpl(); + virtual ~CascadeClassifierImpl() CV_OVERRIDE; - bool empty() const; - bool load( const String& filename ); - void read( const FileNode& node ); + bool empty() const CV_OVERRIDE; + bool load( const String& filename ) CV_OVERRIDE; + void read( const FileNode& node ) CV_OVERRIDE; bool read_( const FileNode& node ); void detectMultiScale( InputArray image, CV_OUT std::vector& objects, double scaleFactor = 1.1, int minNeighbors = 3, int flags = 0, Size minSize = Size(), - Size maxSize = Size() ); + Size maxSize = Size() ) CV_OVERRIDE; void detectMultiScale( InputArray image, CV_OUT std::vector& objects, @@ -97,7 +97,7 @@ public: double scaleFactor=1.1, int minNeighbors=3, int flags=0, Size minSize=Size(), - Size maxSize=Size() ); + Size maxSize=Size() ) CV_OVERRIDE; void detectMultiScale( InputArray image, CV_OUT std::vector& objects, @@ -107,16 +107,16 @@ public: int minNeighbors = 3, int flags = 0, Size minSize = Size(), Size maxSize = Size(), - bool outputRejectLevels = false ); + bool outputRejectLevels = false ) CV_OVERRIDE; - bool isOldFormatCascade() const; - Size getOriginalWindowSize() const; - int getFeatureType() const; - void* getOldCascade(); + bool isOldFormatCascade() const CV_OVERRIDE; + Size getOriginalWindowSize() const CV_OVERRIDE; + int getFeatureType() const CV_OVERRIDE; + void* getOldCascade() CV_OVERRIDE; - void setMaskGenerator(const Ptr& maskGenerator); - Ptr getMaskGenerator(); + void setMaskGenerator(const Ptr& maskGenerator) CV_OVERRIDE; + Ptr getMaskGenerator() CV_OVERRIDE; protected: enum { SUM_ALIGN = 64 }; @@ -311,7 +311,7 @@ protected: #define CALC_SUM_OFS(rect, ptr) CALC_SUM_OFS_((rect)[0], (rect)[1], (rect)[2], (rect)[3], ptr) //---------------------------------------------- HaarEvaluator --------------------------------------- -class HaarEvaluator : public FeatureEvaluator +class HaarEvaluator CV_FINAL : public FeatureEvaluator { public: struct Feature @@ -342,24 +342,24 @@ public: }; HaarEvaluator(); - virtual ~HaarEvaluator(); + virtual ~HaarEvaluator() CV_OVERRIDE; - virtual bool read( const FileNode& node, Size origWinSize); - virtual Ptr clone() const; - virtual int getFeatureType() const { return FeatureEvaluator::HAAR; } + virtual bool read( const FileNode& node, Size origWinSize) CV_OVERRIDE; + virtual Ptr clone() const CV_OVERRIDE; + virtual int getFeatureType() const CV_OVERRIDE { return FeatureEvaluator::HAAR; } - virtual bool setWindow(Point p, int scaleIdx); + virtual bool setWindow(Point p, int scaleIdx) CV_OVERRIDE; Rect getNormRect() const; int getSquaresOffset() const; float operator()(int featureIdx) const { return optfeaturesPtr[featureIdx].calc(pwin) * varianceNormFactor; } - virtual float calcOrd(int featureIdx) const + virtual float calcOrd(int featureIdx) const CV_OVERRIDE { return (*this)(featureIdx); } protected: - virtual void computeChannels( int i, InputArray img ); - virtual void computeOptFeatures(); + virtual void computeChannels( int i, InputArray img ) CV_OVERRIDE; + virtual void computeOptFeatures() CV_OVERRIDE; Ptr > features; Ptr > optfeatures; @@ -403,7 +403,7 @@ inline float HaarEvaluator::OptFeature :: calc( const int* ptr ) const //---------------------------------------------- LBPEvaluator ------------------------------------- -class LBPEvaluator : public FeatureEvaluator +class LBPEvaluator CV_FINAL : public FeatureEvaluator { public: struct Feature @@ -427,21 +427,21 @@ public: }; LBPEvaluator(); - virtual ~LBPEvaluator(); + virtual ~LBPEvaluator() CV_OVERRIDE; - virtual bool read( const FileNode& node, Size origWinSize ); - virtual Ptr clone() const; - virtual int getFeatureType() const { return FeatureEvaluator::LBP; } + virtual bool read( const FileNode& node, Size origWinSize ) CV_OVERRIDE; + virtual Ptr clone() const CV_OVERRIDE; + virtual int getFeatureType() const CV_OVERRIDE { return FeatureEvaluator::LBP; } - virtual bool setWindow(Point p, int scaleIdx); + virtual bool setWindow(Point p, int scaleIdx) CV_OVERRIDE; int operator()(int featureIdx) const { return optfeaturesPtr[featureIdx].calc(pwin); } - virtual int calcCat(int featureIdx) const + virtual int calcCat(int featureIdx) const CV_OVERRIDE { return (*this)(featureIdx); } protected: - virtual void computeChannels( int i, InputArray img ); - virtual void computeOptFeatures(); + virtual void computeChannels( int i, InputArray img ) CV_OVERRIDE; + virtual void computeOptFeatures() CV_OVERRIDE; Ptr > features; Ptr > optfeatures; diff --git a/modules/objdetect/src/haar.cpp b/modules/objdetect/src/haar.cpp index 3b0a151322f45e69f903072277a21f8946cb6822..33110116b8e34c9bd1b5ffe6216c5611bfc38689 100644 --- a/modules/objdetect/src/haar.cpp +++ b/modules/objdetect/src/haar.cpp @@ -957,7 +957,7 @@ public: mtx = _mtx; } - void operator()( const Range& range ) const + void operator()(const Range& range) const CV_OVERRIDE { CV_INSTRUMENT_REGION() @@ -1137,7 +1137,7 @@ public: mtx = _mtx; } - void operator()( const Range& range ) const + void operator()(const Range& range) const CV_OVERRIDE { CV_INSTRUMENT_REGION() diff --git a/modules/objdetect/src/hog.cpp b/modules/objdetect/src/hog.cpp index b68b89d6e6c2b71aecc46eeebc3931fecda906f6..23b710b385afe27e21cf3b938660b49431458cfa 100644 --- a/modules/objdetect/src/hog.cpp +++ b/modules/objdetect/src/hog.cpp @@ -1793,7 +1793,7 @@ public: mtx = _mtx; } - void operator()( const Range& range ) const + void operator()(const Range& range) const CV_OVERRIDE { int i, i1 = range.start, i2 = range.end; double minScale = i1 > 0 ? levelScale[i1] : i2 > 1 ? levelScale[i1+1] : std::max(img.cols, img.rows); @@ -3501,7 +3501,7 @@ public: mtx = _mtx; } - void operator()( const Range& range ) const + void operator()(const Range& range) const CV_OVERRIDE { CV_INSTRUMENT_REGION()