mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-27 23:11:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

photo: apply CV_OVERRIDE/CV_FINAL

Browse Source
This commit is contained in:
Alexander Alekhin 2018-03-15 16:17:00 +03:00
parent 225bae1387
commit e741b71dac
7 changed files with 108 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/photo/include/opencv2/photo.hpp
View File

@ -502,7 +502,7 @@ class CV_EXPORTS_W AlignMTB : public AlignExposures
{ {
public: public:
CV_WRAP virtual void process(InputArrayOfArrays src, std::vector<Mat>& dst, CV_WRAP virtual void process(InputArrayOfArrays src, std::vector<Mat>& dst,
InputArray times, InputArray response) = 0; InputArray times, InputArray response) CV_OVERRIDE = 0;
/** @brief Short version of process, that doesn't take extra arguments. /** @brief Short version of process, that doesn't take extra arguments.
@ -646,7 +646,7 @@ class CV_EXPORTS_W MergeDebevec : public MergeExposures
{ {
public: public:
CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst, CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst,
InputArray times, InputArray response) = 0; InputArray times, InputArray response) CV_OVERRIDE = 0;
CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst, InputArray times) = 0; CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst, InputArray times) = 0;
}; };
@ -669,7 +669,7 @@ class CV_EXPORTS_W MergeMertens : public MergeExposures
{ {
public: public:
CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst, CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst,
InputArray times, InputArray response) = 0; InputArray times, InputArray response) CV_OVERRIDE = 0;
/** @brief Short version of process, that doesn't take extra arguments. /** @brief Short version of process, that doesn't take extra arguments.
@param src vector of input images @param src vector of input images
@ -705,7 +705,7 @@ class CV_EXPORTS_W MergeRobertson : public MergeExposures
{ {
public: public:
CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst, CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst,
InputArray times, InputArray response) = 0; InputArray times, InputArray response) CV_OVERRIDE = 0;
CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst, InputArray times) = 0; CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst, InputArray times) = 0;
}; };

28
modules/photo/src/align.cpp
View File

@ -47,7 +47,7 @@
namespace cv namespace cv
{ {
class AlignMTBImpl : public AlignMTB class AlignMTBImpl CV_FINAL : public AlignMTB
{ {
public: public:
AlignMTBImpl(int _max_bits, int _exclude_range, bool _cut) : AlignMTBImpl(int _max_bits, int _exclude_range, bool _cut) :
@ -59,14 +59,14 @@ public:
} }
void process(InputArrayOfArrays src, std::vector<Mat>& dst, void process(InputArrayOfArrays src, std::vector<Mat>& dst,
InputArray, InputArray) InputArray, InputArray) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
process(src, dst); process(src, dst);
} }
void process(InputArrayOfArrays _src, std::vector<Mat>& dst) void process(InputArrayOfArrays _src, std::vector<Mat>& dst) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
@ -116,7 +116,7 @@ public:
} }
} }
Point calculateShift(InputArray _img0, InputArray _img1) Point calculateShift(InputArray _img0, InputArray _img1) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
@ -164,7 +164,7 @@ public:
return shift; return shift;
} }
void shiftMat(InputArray _src, OutputArray _dst, const Point shift) void shiftMat(InputArray _src, OutputArray _dst, const Point shift) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
@ -181,16 +181,16 @@ public:
res.copyTo(dst); res.copyTo(dst);
} }
int getMaxBits() const { return max_bits; } int getMaxBits() const CV_OVERRIDE { return max_bits; }
void setMaxBits(int val) { max_bits = val; } void setMaxBits(int val) CV_OVERRIDE { max_bits = val; }
int getExcludeRange() const { return exclude_range; } int getExcludeRange() const CV_OVERRIDE { return exclude_range; }
void setExcludeRange(int val) { exclude_range = val; } void setExcludeRange(int val) CV_OVERRIDE { exclude_range = val; }
bool getCut() const { return cut; } bool getCut() const CV_OVERRIDE { return cut; }
void setCut(bool val) { cut = val; } void setCut(bool val) CV_OVERRIDE { cut = val; }
void write(FileStorage& fs) const void write(FileStorage& fs) const CV_OVERRIDE
{ {
writeFormat(fs); writeFormat(fs);
fs << "name" << name fs << "name" << name
@ -199,7 +199,7 @@ public:
<< "cut" << static_cast<int>(cut); << "cut" << static_cast<int>(cut);
} }
void read(const FileNode& fn) void read(const FileNode& fn) CV_OVERRIDE
{ {
FileNode n = fn["name"]; FileNode n = fn["name"];
CV_Assert(n.isString() && String(n) == name); CV_Assert(n.isString() && String(n) == name);
@ -209,7 +209,7 @@ public:
cut = (cut_val != 0); cut = (cut_val != 0);
} }
void computeBitmaps(InputArray _img, OutputArray _tb, OutputArray _eb) void computeBitmaps(InputArray _img, OutputArray _tb, OutputArray _eb) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()

38
modules/photo/src/calibrate.cpp
View File

@ -48,7 +48,7 @@
namespace cv namespace cv
{ {
class CalibrateDebevecImpl : public CalibrateDebevec class CalibrateDebevecImpl CV_FINAL : public CalibrateDebevec
{ {
public: public:
CalibrateDebevecImpl(int _samples, float _lambda, bool _random) : CalibrateDebevecImpl(int _samples, float _lambda, bool _random) :
@ -60,7 +60,7 @@ public:
{ {
} }
void process(InputArrayOfArrays src, OutputArray dst, InputArray _times) void process(InputArrayOfArrays src, OutputArray dst, InputArray _times) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
@ -158,16 +158,16 @@ public:
exp(result, result); exp(result, result);
} }
int getSamples() const { return samples; } int getSamples() const CV_OVERRIDE { return samples; }
void setSamples(int val) { samples = val; } void setSamples(int val) CV_OVERRIDE { samples = val; }
float getLambda() const { return lambda; } float getLambda() const CV_OVERRIDE { return lambda; }
void setLambda(float val) { lambda = val; } void setLambda(float val) CV_OVERRIDE { lambda = val; }
bool getRandom() const { return random; } bool getRandom() const CV_OVERRIDE { return random; }
void setRandom(bool val) { random = val; } void setRandom(bool val) CV_OVERRIDE { random = val; }
void write(FileStorage& fs) const void write(FileStorage& fs) const CV_OVERRIDE
{ {
writeFormat(fs); writeFormat(fs);
fs << "name" << name fs << "name" << name
@ -176,7 +176,7 @@ public:
<< "random" << static_cast<int>(random); << "random" << static_cast<int>(random);
} }
void read(const FileNode& fn) void read(const FileNode& fn) CV_OVERRIDE
{ {
FileNode n = fn["name"]; FileNode n = fn["name"];
CV_Assert(n.isString() && String(n) == name); CV_Assert(n.isString() && String(n) == name);
@ -199,7 +199,7 @@ Ptr<CalibrateDebevec> createCalibrateDebevec(int samples, float lambda, bool ran
return makePtr<CalibrateDebevecImpl>(samples, lambda, random); return makePtr<CalibrateDebevecImpl>(samples, lambda, random);
} }
class CalibrateRobertsonImpl : public CalibrateRobertson class CalibrateRobertsonImpl CV_FINAL : public CalibrateRobertson
{ {
public: public:
CalibrateRobertsonImpl(int _max_iter, float _threshold) : CalibrateRobertsonImpl(int _max_iter, float _threshold) :
@ -210,7 +210,7 @@ public:
{ {
} }
void process(InputArrayOfArrays src, OutputArray dst, InputArray _times) void process(InputArrayOfArrays src, OutputArray dst, InputArray _times) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
@ -272,15 +272,15 @@ public:
} }
} }
int getMaxIter() const { return max_iter; } int getMaxIter() const CV_OVERRIDE { return max_iter; }
void setMaxIter(int val) { max_iter = val; } void setMaxIter(int val) CV_OVERRIDE { max_iter = val; }
float getThreshold() const { return threshold; } float getThreshold() const CV_OVERRIDE { return threshold; }
void setThreshold(float val) { threshold = val; } void setThreshold(float val) CV_OVERRIDE { threshold = val; }
Mat getRadiance() const { return radiance; } Mat getRadiance() const CV_OVERRIDE { return radiance; }
void write(FileStorage& fs) const void write(FileStorage& fs) const CV_OVERRIDE
{ {
writeFormat(fs); writeFormat(fs);
fs << "name" << name fs << "name" << name
@ -288,7 +288,7 @@ public:
<< "threshold" << threshold; << "threshold" << threshold;
} }
void read(const FileNode& fn) void read(const FileNode& fn) CV_OVERRIDE
{ {
FileNode n = fn["name"]; FileNode n = fn["name"];
CV_Assert(n.isString() && String(n) == name); CV_Assert(n.isString() && String(n) == name);

2
modules/photo/src/fast_nlmeans_denoising_invoker.hpp
View File

@ -58,7 +58,7 @@ public:
FastNlMeansDenoisingInvoker(const Mat& src, Mat& dst, FastNlMeansDenoisingInvoker(const Mat& src, Mat& dst,
int template_window_size, int search_window_size, const float *h); int template_window_size, int search_window_size, const float *h);
void operator() (const Range& range) const; void operator() (const Range& range) const CV_OVERRIDE;
private: private:
void operator= (const FastNlMeansDenoisingInvoker&); void operator= (const FastNlMeansDenoisingInvoker&);

2
modules/photo/src/fast_nlmeans_multi_denoising_invoker.hpp
View File

@ -59,7 +59,7 @@ public:
int temporalWindowSize, Mat& dst, int template_window_size, int temporalWindowSize, Mat& dst, int template_window_size,
int search_window_size, const float *h); int search_window_size, const float *h);
void operator() (const Range& range) const; void operator() (const Range& range) const CV_OVERRIDE;
private: private:
void operator= (const FastNlMeansMultiDenoisingInvoker&); void operator= (const FastNlMeansMultiDenoisingInvoker&);

34
modules/photo/src/merge.cpp
View File

@ -47,7 +47,7 @@
namespace cv namespace cv
{ {
class MergeDebevecImpl : public MergeDebevec class MergeDebevecImpl CV_FINAL : public MergeDebevec
{ {
public: public:
MergeDebevecImpl() : MergeDebevecImpl() :
@ -56,7 +56,7 @@ public:
{ {
} }
void process(InputArrayOfArrays src, OutputArray dst, InputArray _times, InputArray input_response) void process(InputArrayOfArrays src, OutputArray dst, InputArray _times, InputArray input_response) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
@ -122,7 +122,7 @@ public:
exp(result, result); exp(result, result);
} }
void process(InputArrayOfArrays src, OutputArray dst, InputArray times) void process(InputArrayOfArrays src, OutputArray dst, InputArray times) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
@ -139,7 +139,7 @@ Ptr<MergeDebevec> createMergeDebevec()
return makePtr<MergeDebevecImpl>(); return makePtr<MergeDebevecImpl>();
} }
class MergeMertensImpl : public MergeMertens class MergeMertensImpl CV_FINAL : public MergeMertens
{ {
public: public:
MergeMertensImpl(float _wcon, float _wsat, float _wexp) : MergeMertensImpl(float _wcon, float _wsat, float _wexp) :
@ -150,14 +150,14 @@ public:
{ {
} }
void process(InputArrayOfArrays src, OutputArrayOfArrays dst, InputArray, InputArray) void process(InputArrayOfArrays src, OutputArrayOfArrays dst, InputArray, InputArray) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
process(src, dst); process(src, dst);
} }
void process(InputArrayOfArrays src, OutputArray dst) void process(InputArrayOfArrays src, OutputArray dst) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
@ -262,16 +262,16 @@ public:
res_pyr[0].copyTo(dst.getMat()); res_pyr[0].copyTo(dst.getMat());
} }
float getContrastWeight() const { return wcon; } float getContrastWeight() const CV_OVERRIDE { return wcon; }
void setContrastWeight(float val) { wcon = val; } void setContrastWeight(float val) CV_OVERRIDE { wcon = val; }
float getSaturationWeight() const { return wsat; } float getSaturationWeight() const CV_OVERRIDE { return wsat; }
void setSaturationWeight(float val) { wsat = val; } void setSaturationWeight(float val) CV_OVERRIDE { wsat = val; }
float getExposureWeight() const { return wexp; } float getExposureWeight() const CV_OVERRIDE { return wexp; }
void setExposureWeight(float val) { wexp = val; } void setExposureWeight(float val) CV_OVERRIDE { wexp = val; }
void write(FileStorage& fs) const void write(FileStorage& fs) const CV_OVERRIDE
{ {
writeFormat(fs); writeFormat(fs);
fs << "name" << name fs << "name" << name
@ -280,7 +280,7 @@ public:
<< "exposure_weight" << wexp; << "exposure_weight" << wexp;
} }
void read(const FileNode& fn) void read(const FileNode& fn) CV_OVERRIDE
{ {
FileNode n = fn["name"]; FileNode n = fn["name"];
CV_Assert(n.isString() && String(n) == name); CV_Assert(n.isString() && String(n) == name);
@ -299,7 +299,7 @@ Ptr<MergeMertens> createMergeMertens(float wcon, float wsat, float wexp)
return makePtr<MergeMertensImpl>(wcon, wsat, wexp); return makePtr<MergeMertensImpl>(wcon, wsat, wexp);
} }
class MergeRobertsonImpl : public MergeRobertson class MergeRobertsonImpl CV_FINAL : public MergeRobertson
{ {
public: public:
MergeRobertsonImpl() : MergeRobertsonImpl() :
@ -308,7 +308,7 @@ public:
{ {
} }
void process(InputArrayOfArrays src, OutputArray dst, InputArray _times, InputArray input_response) void process(InputArrayOfArrays src, OutputArray dst, InputArray _times, InputArray input_response) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
@ -347,7 +347,7 @@ public:
result = result.mul(1 / wsum); result = result.mul(1 / wsum);
} }
void process(InputArrayOfArrays src, OutputArray dst, InputArray times) void process(InputArrayOfArrays src, OutputArray dst, InputArray times) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()

104
modules/photo/src/tonemap.cpp
View File

@ -53,14 +53,14 @@ inline void log_(const Mat& src, Mat& dst)
log(dst, dst); log(dst, dst);
} }
class TonemapImpl : public Tonemap class TonemapImpl CV_FINAL : public Tonemap
{ {
public: public:
TonemapImpl(float _gamma) : name("Tonemap"), gamma(_gamma) TonemapImpl(float _gamma) : name("Tonemap"), gamma(_gamma)
{ {
} }
void process(InputArray _src, OutputArray _dst) void process(InputArray _src, OutputArray _dst) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
@ -80,17 +80,17 @@ public:
pow(dst, 1.0f / gamma, dst); pow(dst, 1.0f / gamma, dst);
} }
float getGamma() const { return gamma; } float getGamma() const CV_OVERRIDE { return gamma; }
void setGamma(float val) { gamma = val; } void setGamma(float val) CV_OVERRIDE { gamma = val; }
void write(FileStorage& fs) const void write(FileStorage& fs) const CV_OVERRIDE
{ {
writeFormat(fs); writeFormat(fs);
fs << "name" << name fs << "name" << name
<< "gamma" << gamma; << "gamma" << gamma;
} }
void read(const FileNode& fn) void read(const FileNode& fn) CV_OVERRIDE
{ {
FileNode n = fn["name"]; FileNode n = fn["name"];
CV_Assert(n.isString() && String(n) == name); CV_Assert(n.isString() && String(n) == name);
@ -107,7 +107,7 @@ Ptr<Tonemap> createTonemap(float gamma)
return makePtr<TonemapImpl>(gamma); return makePtr<TonemapImpl>(gamma);
} }
class TonemapDragoImpl : public TonemapDrago class TonemapDragoImpl CV_FINAL : public TonemapDrago
{ {
public: public:
TonemapDragoImpl(float _gamma, float _saturation, float _bias) : TonemapDragoImpl(float _gamma, float _saturation, float _bias) :
@ -118,7 +118,7 @@ public:
{ {
} }
void process(InputArray _src, OutputArray _dst) void process(InputArray _src, OutputArray _dst) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
@ -155,16 +155,16 @@ public:
linear->process(img, img); linear->process(img, img);
} }
float getGamma() const { return gamma; } float getGamma() const CV_OVERRIDE { return gamma; }
void setGamma(float val) { gamma = val; } void setGamma(float val) CV_OVERRIDE { gamma = val; }
float getSaturation() const { return saturation; } float getSaturation() const CV_OVERRIDE { return saturation; }
void setSaturation(float val) { saturation = val; } void setSaturation(float val) CV_OVERRIDE { saturation = val; }
float getBias() const { return bias; } float getBias() const CV_OVERRIDE { return bias; }
void setBias(float val) { bias = val; } void setBias(float val) CV_OVERRIDE { bias = val; }
void write(FileStorage& fs) const void write(FileStorage& fs) const CV_OVERRIDE
{ {
writeFormat(fs); writeFormat(fs);
fs << "name" << name fs << "name" << name
@ -173,7 +173,7 @@ public:
<< "saturation" << saturation; << "saturation" << saturation;
} }
void read(const FileNode& fn) void read(const FileNode& fn) CV_OVERRIDE
{ {
FileNode n = fn["name"]; FileNode n = fn["name"];
CV_Assert(n.isString() && String(n) == name); CV_Assert(n.isString() && String(n) == name);
@ -192,7 +192,7 @@ Ptr<TonemapDrago> createTonemapDrago(float gamma, float saturation, float bias)
return makePtr<TonemapDragoImpl>(gamma, saturation, bias); return makePtr<TonemapDragoImpl>(gamma, saturation, bias);
} }
class TonemapDurandImpl : public TonemapDurand class TonemapDurandImpl CV_FINAL : public TonemapDurand
{ {
public: public:
TonemapDurandImpl(float _gamma, float _contrast, float _saturation, float _sigma_color, float _sigma_space) : TonemapDurandImpl(float _gamma, float _contrast, float _saturation, float _sigma_color, float _sigma_space) :
@ -205,7 +205,7 @@ public:
{ {
} }
void process(InputArray _src, OutputArray _dst) void process(InputArray _src, OutputArray _dst) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
@ -233,22 +233,22 @@ public:
pow(img, 1.0f / gamma, img); pow(img, 1.0f / gamma, img);
} }
float getGamma() const { return gamma; } float getGamma() const CV_OVERRIDE { return gamma; }
void setGamma(float val) { gamma = val; } void setGamma(float val) CV_OVERRIDE { gamma = val; }
float getSaturation() const { return saturation; } float getSaturation() const CV_OVERRIDE { return saturation; }
void setSaturation(float val) { saturation = val; } void setSaturation(float val) CV_OVERRIDE { saturation = val; }
float getContrast() const { return contrast; } float getContrast() const CV_OVERRIDE { return contrast; }
void setContrast(float val) { contrast = val; } void setContrast(float val) CV_OVERRIDE { contrast = val; }
float getSigmaColor() const { return sigma_color; } float getSigmaColor() const CV_OVERRIDE { return sigma_color; }
void setSigmaColor(float val) { sigma_color = val; } void setSigmaColor(float val) CV_OVERRIDE { sigma_color = val; }
float getSigmaSpace() const { return sigma_space; } float getSigmaSpace() const CV_OVERRIDE { return sigma_space; }
void setSigmaSpace(float val) { sigma_space = val; } void setSigmaSpace(float val) CV_OVERRIDE { sigma_space = val; }
void write(FileStorage& fs) const void write(FileStorage& fs) const CV_OVERRIDE
{ {
writeFormat(fs); writeFormat(fs);
fs << "name" << name fs << "name" << name
@ -259,7 +259,7 @@ public:
<< "saturation" << saturation; << "saturation" << saturation;
} }
void read(const FileNode& fn) void read(const FileNode& fn) CV_OVERRIDE
{ {
FileNode n = fn["name"]; FileNode n = fn["name"];
CV_Assert(n.isString() && String(n) == name); CV_Assert(n.isString() && String(n) == name);
@ -280,7 +280,7 @@ Ptr<TonemapDurand> createTonemapDurand(float gamma, float contrast, float satura
return makePtr<TonemapDurandImpl>(gamma, contrast, saturation, sigma_color, sigma_space); return makePtr<TonemapDurandImpl>(gamma, contrast, saturation, sigma_color, sigma_space);
} }
class TonemapReinhardImpl : public TonemapReinhard class TonemapReinhardImpl CV_FINAL : public TonemapReinhard
{ {
public: public:
TonemapReinhardImpl(float _gamma, float _intensity, float _light_adapt, float _color_adapt) : TonemapReinhardImpl(float _gamma, float _intensity, float _light_adapt, float _color_adapt) :
@ -292,7 +292,7 @@ public:
{ {
} }
void process(InputArray _src, OutputArray _dst) void process(InputArray _src, OutputArray _dst) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
@ -336,19 +336,19 @@ public:
linear->process(img, img); linear->process(img, img);
} }
float getGamma() const { return gamma; } float getGamma() const CV_OVERRIDE { return gamma; }
void setGamma(float val) { gamma = val; } void setGamma(float val) CV_OVERRIDE { gamma = val; }
float getIntensity() const { return intensity; } float getIntensity() const CV_OVERRIDE { return intensity; }
void setIntensity(float val) { intensity = val; } void setIntensity(float val) CV_OVERRIDE { intensity = val; }
float getLightAdaptation() const { return light_adapt; } float getLightAdaptation() const CV_OVERRIDE { return light_adapt; }
void setLightAdaptation(float val) { light_adapt = val; } void setLightAdaptation(float val) CV_OVERRIDE { light_adapt = val; }
float getColorAdaptation() const { return color_adapt; } float getColorAdaptation() const CV_OVERRIDE { return color_adapt; }
void setColorAdaptation(float val) { color_adapt = val; } void setColorAdaptation(float val) CV_OVERRIDE { color_adapt = val; }
void write(FileStorage& fs) const void write(FileStorage& fs) const CV_OVERRIDE
{ {
writeFormat(fs); writeFormat(fs);
fs << "name" << name fs << "name" << name
@ -358,7 +358,7 @@ public:
<< "color_adapt" << color_adapt; << "color_adapt" << color_adapt;
} }
void read(const FileNode& fn) void read(const FileNode& fn) CV_OVERRIDE
{ {
FileNode n = fn["name"]; FileNode n = fn["name"];
CV_Assert(n.isString() && String(n) == name); CV_Assert(n.isString() && String(n) == name);
@ -378,7 +378,7 @@ Ptr<TonemapReinhard> createTonemapReinhard(float gamma, float contrast, float si
return makePtr<TonemapReinhardImpl>(gamma, contrast, sigma_color, sigma_space); return makePtr<TonemapReinhardImpl>(gamma, contrast, sigma_color, sigma_space);
} }
class TonemapMantiukImpl : public TonemapMantiuk class TonemapMantiukImpl CV_FINAL : public TonemapMantiuk
{ {
public: public:
TonemapMantiukImpl(float _gamma, float _scale, float _saturation) : TonemapMantiukImpl(float _gamma, float _scale, float _saturation) :
@ -389,7 +389,7 @@ public:
{ {
} }
void process(InputArray _src, OutputArray _dst) void process(InputArray _src, OutputArray _dst) CV_OVERRIDE
{ {
CV_INSTRUMENT_REGION() CV_INSTRUMENT_REGION()
@ -449,16 +449,16 @@ public:
linear->process(img, img); linear->process(img, img);
} }
float getGamma() const { return gamma; } float getGamma() const CV_OVERRIDE { return gamma; }
void setGamma(float val) { gamma = val; } void setGamma(float val) CV_OVERRIDE { gamma = val; }
float getScale() const { return scale; } float getScale() const CV_OVERRIDE { return scale; }
void setScale(float val) { scale = val; } void setScale(float val) CV_OVERRIDE { scale = val; }
float getSaturation() const { return saturation; } float getSaturation() const CV_OVERRIDE { return saturation; }
void setSaturation(float val) { saturation = val; } void setSaturation(float val) CV_OVERRIDE { saturation = val; }
void write(FileStorage& fs) const void write(FileStorage& fs) const CV_OVERRIDE
{ {
writeFormat(fs); writeFormat(fs);
fs << "name" << name fs << "name" << name
@ -467,7 +467,7 @@ public:
<< "saturation" << saturation; << "saturation" << saturation;
} }
void read(const FileNode& fn) void read(const FileNode& fn) CV_OVERRIDE
{ {
FileNode n = fn["name"]; FileNode n = fn["name"];
CV_Assert(n.isString() && String(n) == name); CV_Assert(n.isString() && String(n) == name);