From f8eeab57c69a1b7118eaa72cda158ad650cf79e3 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Wed, 21 Mar 2018 16:58:10 +0300 Subject: [PATCH] img_hash: apply CV_OVERRIDE/CV_FINAL --- modules/img_hash/src/average_hash.cpp | 6 +++--- modules/img_hash/src/block_mean_hash.cpp | 8 ++++---- modules/img_hash/src/color_moment_hash.cpp | 8 ++++---- modules/img_hash/src/marr_hildreth_hash.cpp | 8 ++++---- modules/img_hash/src/phash.cpp | 6 +++--- modules/img_hash/src/radial_variance_hash.cpp | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/img_hash/src/average_hash.cpp b/modules/img_hash/src/average_hash.cpp index 6690952cc..316a2165c 100644 --- a/modules/img_hash/src/average_hash.cpp +++ b/modules/img_hash/src/average_hash.cpp @@ -10,7 +10,7 @@ using namespace img_hash; namespace { -class AverageHashImpl : public ImgHashBase::ImgHashImpl +class AverageHashImpl CV_FINAL : public ImgHashBase::ImgHashImpl { private: cv::Mat bitsImg; @@ -19,7 +19,7 @@ private: public: - virtual void compute(cv::InputArray inputArr, cv::OutputArray outputArr) + virtual void compute(cv::InputArray inputArr, cv::OutputArray outputArr) CV_OVERRIDE { cv::Mat const input = inputArr.getMat(); CV_Assert(input.type() == CV_8UC4 || @@ -59,7 +59,7 @@ public: } } - virtual double compare(cv::InputArray hashOne, cv::InputArray hashTwo) const + virtual double compare(cv::InputArray hashOne, cv::InputArray hashTwo) const CV_OVERRIDE { return norm(hashOne, hashTwo, NORM_HAMMING); } diff --git a/modules/img_hash/src/block_mean_hash.cpp b/modules/img_hash/src/block_mean_hash.cpp index 768ae7382..15d4fd3c1 100644 --- a/modules/img_hash/src/block_mean_hash.cpp +++ b/modules/img_hash/src/block_mean_hash.cpp @@ -22,7 +22,7 @@ enum colSize = imgWidth - blockWidth }; -class BlockMeanHashImpl : public ImgHashBase::ImgHashImpl +class BlockMeanHashImpl CV_FINAL : public ImgHashBase::ImgHashImpl { public: BlockMeanHashImpl(int mode) @@ -30,9 +30,9 @@ public: setMode(mode); } - ~BlockMeanHashImpl() {} + ~BlockMeanHashImpl() CV_OVERRIDE {} - virtual void compute(cv::InputArray inputArr, cv::OutputArray outputArr) + virtual void compute(cv::InputArray inputArr, cv::OutputArray outputArr) CV_OVERRIDE { cv::Mat const input = inputArr.getMat(); CV_Assert(input.type() == CV_8UC4 || @@ -81,7 +81,7 @@ public: createHash(hash); } - virtual double compare(cv::InputArray hashOne, cv::InputArray hashTwo) const + virtual double compare(cv::InputArray hashOne, cv::InputArray hashTwo) const CV_OVERRIDE { return norm(hashOne, hashTwo, NORM_HAMMING); } diff --git a/modules/img_hash/src/color_moment_hash.cpp b/modules/img_hash/src/color_moment_hash.cpp index 006f40efd..90f2972cc 100644 --- a/modules/img_hash/src/color_moment_hash.cpp +++ b/modules/img_hash/src/color_moment_hash.cpp @@ -10,12 +10,12 @@ using namespace std; namespace { -class ColorMomentHashImpl : public ImgHashBase::ImgHashImpl +class ColorMomentHashImpl CV_FINAL : public ImgHashBase::ImgHashImpl { public: - ~ColorMomentHashImpl() {} + ~ColorMomentHashImpl() CV_OVERRIDE {} - virtual void compute(cv::InputArray inputArr, cv::OutputArray outputArr) + virtual void compute(cv::InputArray inputArr, cv::OutputArray outputArr) CV_OVERRIDE { cv::Mat const input = inputArr.getMat(); CV_Assert(input.type() == CV_8UC4 || @@ -51,7 +51,7 @@ public: computeMoments(hash.ptr(0) + 21); } - virtual double compare(cv::InputArray hashOne, cv::InputArray hashTwo) const + virtual double compare(cv::InputArray hashOne, cv::InputArray hashTwo) const CV_OVERRIDE { return norm(hashOne, hashTwo, NORM_L2) * 10000; } diff --git a/modules/img_hash/src/marr_hildreth_hash.cpp b/modules/img_hash/src/marr_hildreth_hash.cpp index 54a6e85be..2feeb0e78 100644 --- a/modules/img_hash/src/marr_hildreth_hash.cpp +++ b/modules/img_hash/src/marr_hildreth_hash.cpp @@ -86,7 +86,7 @@ void createHash(cv::Mat const &blocks, cv::Mat &hash) } } -class MarrHildrethHashImpl : public ImgHashBase::ImgHashImpl +class MarrHildrethHashImpl CV_FINAL : public ImgHashBase::ImgHashImpl { public: @@ -96,9 +96,9 @@ public: blocks.create(31,31, CV_32F); } - ~MarrHildrethHashImpl() { } + ~MarrHildrethHashImpl() CV_OVERRIDE { } - virtual void compute(cv::InputArray inputArr, cv::OutputArray outputArr) + virtual void compute(cv::InputArray inputArr, cv::OutputArray outputArr) CV_OVERRIDE { cv::Mat const input = inputArr.getMat(); CV_Assert(input.type() == CV_8UC4 || @@ -131,7 +131,7 @@ public: createHash(blocks, hash); } - virtual double compare(cv::InputArray hashOne, cv::InputArray hashTwo) const + virtual double compare(cv::InputArray hashOne, cv::InputArray hashTwo) const CV_OVERRIDE { return norm(hashOne, hashTwo, NORM_HAMMING); } diff --git a/modules/img_hash/src/phash.cpp b/modules/img_hash/src/phash.cpp index fd672d971..03eefa97b 100644 --- a/modules/img_hash/src/phash.cpp +++ b/modules/img_hash/src/phash.cpp @@ -10,10 +10,10 @@ using namespace std; namespace { -class PHashImpl : public ImgHashBase::ImgHashImpl +class PHashImpl CV_FINAL : public ImgHashBase::ImgHashImpl { public: - virtual void compute(cv::InputArray inputArr, cv::OutputArray outputArr) + virtual void compute(cv::InputArray inputArr, cv::OutputArray outputArr) CV_OVERRIDE { cv::Mat const input = inputArr.getMat(); CV_Assert(input.type() == CV_8UC4 || @@ -58,7 +58,7 @@ public: } } - virtual double compare(cv::InputArray hashOne, cv::InputArray hashTwo) const + virtual double compare(cv::InputArray hashOne, cv::InputArray hashTwo) const CV_OVERRIDE { return norm(hashOne, hashTwo, NORM_HAMMING); } diff --git a/modules/img_hash/src/radial_variance_hash.cpp b/modules/img_hash/src/radial_variance_hash.cpp index 1265abc31..b2eaef2ec 100644 --- a/modules/img_hash/src/radial_variance_hash.cpp +++ b/modules/img_hash/src/radial_variance_hash.cpp @@ -26,7 +26,7 @@ inline int createOffSet(int length) return static_cast(std::floor(center + roundingFactor(center))); } -class RadialVarianceHashImpl : public ImgHashBase::ImgHashImpl +class RadialVarianceHashImpl CV_FINAL : public ImgHashBase::ImgHashImpl { public: cv::Mat blurImg_; @@ -42,9 +42,9 @@ public: { } - ~RadialVarianceHashImpl() {} + ~RadialVarianceHashImpl() CV_OVERRIDE {} - virtual void compute(cv::InputArray inputArr, cv::OutputArray outputArr) + virtual void compute(cv::InputArray inputArr, cv::OutputArray outputArr) CV_OVERRIDE { cv::Mat const input = inputArr.getMat(); CV_Assert(input.type() == CV_8UC4 || @@ -72,7 +72,7 @@ public: hashCalculate(hash); } - virtual double compare(cv::InputArray hashOne, cv::InputArray hashTwo) const + virtual double compare(cv::InputArray hashOne, cv::InputArray hashTwo) const CV_OVERRIDE { cv::Mat const hashOneF = hashOne.getMat(); cv::Mat const hashTwoF = hashTwo.getMat();