samples: apply CV_OVERRIDE/CV_FINAL

This commit is contained in:
Alexander Alekhin 2018-03-20 18:29:10 +03:00
parent 25be4186bc
commit cfdffdd519
2 changed files with 4 additions and 4 deletions

View File

@ -24,12 +24,12 @@ class CascadeDetectorAdapter: public DetectionBasedTracker::IDetector
CV_Assert(detector); CV_Assert(detector);
} }
void detect(const cv::Mat &Image, std::vector<cv::Rect> &objects) void detect(const cv::Mat &Image, std::vector<cv::Rect> &objects) CV_OVERRIDE
{ {
Detector->detectMultiScale(Image, objects, scaleFactor, minNeighbours, 0, minObjSize, maxObjSize); Detector->detectMultiScale(Image, objects, scaleFactor, minNeighbours, 0, minObjSize, maxObjSize);
} }
virtual ~CascadeDetectorAdapter() virtual ~CascadeDetectorAdapter() CV_OVERRIDE
{} {}
private: private:

View File

@ -192,7 +192,7 @@ public:
MotionEstimatorRansacL2Builder(CommandLineParser &command, bool use_gpu, const string &_prefix = "") MotionEstimatorRansacL2Builder(CommandLineParser &command, bool use_gpu, const string &_prefix = "")
: IMotionEstimatorBuilder(command), gpu(use_gpu), prefix(_prefix) {} : IMotionEstimatorBuilder(command), gpu(use_gpu), prefix(_prefix) {}
virtual Ptr<ImageMotionEstimatorBase> build() virtual Ptr<ImageMotionEstimatorBase> build() CV_OVERRIDE
{ {
Ptr<MotionEstimatorRansacL2> est = makePtr<MotionEstimatorRansacL2>(motionModel(arg(prefix + "model"))); Ptr<MotionEstimatorRansacL2> est = makePtr<MotionEstimatorRansacL2>(motionModel(arg(prefix + "model")));
@ -245,7 +245,7 @@ public:
MotionEstimatorL1Builder(CommandLineParser &command, bool use_gpu, const string &_prefix = "") MotionEstimatorL1Builder(CommandLineParser &command, bool use_gpu, const string &_prefix = "")
: IMotionEstimatorBuilder(command), gpu(use_gpu), prefix(_prefix) {} : IMotionEstimatorBuilder(command), gpu(use_gpu), prefix(_prefix) {}
virtual Ptr<ImageMotionEstimatorBase> build() virtual Ptr<ImageMotionEstimatorBase> build() CV_OVERRIDE
{ {
Ptr<MotionEstimatorL1> est = makePtr<MotionEstimatorL1>(motionModel(arg(prefix + "model"))); Ptr<MotionEstimatorL1> est = makePtr<MotionEstimatorL1>(motionModel(arg(prefix + "model")));