Skip to content

O
opencv
Commit 1ca7ae96 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

video: apply CV_OVERRIDE/CV_FINAL

parent e741b71d
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 106 deletions
modules/video/include/opencv2/video/background_segm.hpp
View file @ 1ca7ae96
...@@ -205,7 +205,7 @@ public: ...@@ -205,7 +205,7 @@ public:
rate. 0 means that the background model is not updated at all, 1 means that the background model rate. 0 means that the background model is not updated at all, 1 means that the background model
is completely reinitialized from the last frame. is completely reinitialized from the last frame.
*/ */
CV_WRAP virtual void apply(InputArray image, OutputArray fgmask, double learningRate=-1) = 0; CV_WRAP virtual void apply(InputArray image, OutputArray fgmask, double learningRate=-1) CV_OVERRIDE = 0;
}; };
/** @brief Creates MOG2 Background Subtractor /** @brief Creates MOG2 Background Subtractor
......
modules/video/src/bgfg_KNN.cpp
View file @ 1ca7ae96
...@@ -64,7 +64,7 @@ static const float defaultDist2Threshold = 20.0f*20.0f;//threshold on distance f ...@@ -64,7 +64,7 @@ static const float defaultDist2Threshold = 20.0f*20.0f;//threshold on distance f
static const unsigned char defaultnShadowDetection2 = (unsigned char)127; // value to use in the segmentation mask for shadows, set 0 not to do shadow detection static const unsigned char defaultnShadowDetection2 = (unsigned char)127; // value to use in the segmentation mask for shadows, set 0 not to do shadow detection
static const float defaultfTau = 0.5f; // Tau - shadow threshold, see the paper for explanation static const float defaultfTau = 0.5f; // Tau - shadow threshold, see the paper for explanation
class BackgroundSubtractorKNNImpl : public BackgroundSubtractorKNN class BackgroundSubtractorKNNImpl CV_FINAL : public BackgroundSubtractorKNN
{ {
public: public:
//! the default constructor //! the default constructor
...@@ -128,12 +128,12 @@ public: ...@@ -128,12 +128,12 @@ public:
#endif #endif
} }
//! the destructor //! the destructor
~BackgroundSubtractorKNNImpl() {} ~BackgroundSubtractorKNNImpl() CV_OVERRIDE {}
//! the update operator //! the update operator
void apply(InputArray image, OutputArray fgmask, double learningRate=-1); void apply(InputArray image, OutputArray fgmask, double learningRate) CV_OVERRIDE;
//! computes a background image which are the mean of all background gaussians //! computes a background image which are the mean of all background gaussians
virtual void getBackgroundImage(OutputArray backgroundImage) const; virtual void getBackgroundImage(OutputArray backgroundImage) const CV_OVERRIDE;
//! re-initialization method //! re-initialization method
void initialize(Size _frameSize, int _frameType) void initialize(Size _frameSize, int _frameType)
...@@ -214,20 +214,20 @@ public: ...@@ -214,20 +214,20 @@ public:
} }
} }
virtual int getHistory() const { return history; } virtual int getHistory() const CV_OVERRIDE { return history; }
virtual void setHistory(int _nframes) { history = _nframes; } virtual void setHistory(int _nframes) CV_OVERRIDE { history = _nframes; }
virtual int getNSamples() const { return nN; } virtual int getNSamples() const CV_OVERRIDE { return nN; }
virtual void setNSamples(int _nN) { nN = _nN; }//needs reinitialization! virtual void setNSamples(int _nN) CV_OVERRIDE { nN = _nN; }//needs reinitialization!
virtual int getkNNSamples() const { return nkNN; } virtual int getkNNSamples() const CV_OVERRIDE { return nkNN; }
virtual void setkNNSamples(int _nkNN) { nkNN = _nkNN; } virtual void setkNNSamples(int _nkNN) CV_OVERRIDE { nkNN = _nkNN; }
virtual double getDist2Threshold() const { return fTb; } virtual double getDist2Threshold() const CV_OVERRIDE { return fTb; }
virtual void setDist2Threshold(double _dist2Threshold) { fTb = (float)_dist2Threshold; } virtual void setDist2Threshold(double _dist2Threshold) CV_OVERRIDE { fTb = (float)_dist2Threshold; }
virtual bool getDetectShadows() const { return bShadowDetection; } virtual bool getDetectShadows() const CV_OVERRIDE { return bShadowDetection; }
virtual void setDetectShadows(bool detectshadows) virtual void setDetectShadows(bool detectshadows) CV_OVERRIDE
{ {
if ((bShadowDetection && detectshadows) || (!bShadowDetection && !detectshadows)) if ((bShadowDetection && detectshadows) || (!bShadowDetection && !detectshadows))
return; return;
...@@ -241,13 +241,13 @@ public: ...@@ -241,13 +241,13 @@ public:
#endif #endif
} }
virtual int getShadowValue() const { return nShadowDetection; } virtual int getShadowValue() const CV_OVERRIDE { return nShadowDetection; }
virtual void setShadowValue(int value) { nShadowDetection = (uchar)value; } virtual void setShadowValue(int value) CV_OVERRIDE { nShadowDetection = (uchar)value; }
virtual double getShadowThreshold() const { return fTau; } virtual double getShadowThreshold() const CV_OVERRIDE { return fTau; }
virtual void setShadowThreshold(double value) { fTau = (float)value; } virtual void setShadowThreshold(double value) CV_OVERRIDE { fTau = (float)value; }
virtual void write(FileStorage& fs) const virtual void write(FileStorage& fs) const CV_OVERRIDE
{ {
writeFormat(fs); writeFormat(fs);
fs << "name" << name_ fs << "name" << name_
...@@ -260,7 +260,7 @@ public: ...@@ -260,7 +260,7 @@ public:
<< "shadowThreshold" << fTau; << "shadowThreshold" << fTau;
} }
virtual void read(const FileNode& fn) virtual void read(const FileNode& fn) CV_OVERRIDE
{ {
CV_Assert( (String)fn["name"] == name_ ); CV_Assert( (String)fn["name"] == name_ );
history = (int)fn["history"]; history = (int)fn["history"];
...@@ -546,7 +546,7 @@ public: ...@@ -546,7 +546,7 @@ public:
m_nShadowDetection = _nShadowDetection; m_nShadowDetection = _nShadowDetection;
} }
void operator()(const Range& range) const void operator()(const Range& range) const CV_OVERRIDE
{ {
int y0 = range.start, y1 = range.end; int y0 = range.start, y1 = range.end;
int ncols = src->cols, nchannels = src->channels(); int ncols = src->cols, nchannels = src->channels();
......
modules/video/src/bgfg_gaussmix2.cpp
View file @ 1ca7ae96
...@@ -118,7 +118,7 @@ static const unsigned char defaultnShadowDetection2 = (unsigned char)127; // val ...@@ -118,7 +118,7 @@ static const unsigned char defaultnShadowDetection2 = (unsigned char)127; // val
static const float defaultfTau = 0.5f; // Tau - shadow threshold, see the paper for explanation static const float defaultfTau = 0.5f; // Tau - shadow threshold, see the paper for explanation
class BackgroundSubtractorMOG2Impl : public BackgroundSubtractorMOG2 class BackgroundSubtractorMOG2Impl CV_FINAL : public BackgroundSubtractorMOG2
{ {
public: public:
//! the default constructor //! the default constructor
...@@ -174,12 +174,12 @@ public: ...@@ -174,12 +174,12 @@ public:
#endif #endif
} }
//! the destructor //! the destructor
~BackgroundSubtractorMOG2Impl() {} ~BackgroundSubtractorMOG2Impl() CV_OVERRIDE {}
//! the update operator //! the update operator
void apply(InputArray image, OutputArray fgmask, double learningRate=-1); void apply(InputArray image, OutputArray fgmask, double learningRate) CV_OVERRIDE;
//! computes a background image which are the mean of all background gaussians //! computes a background image which are the mean of all background gaussians
virtual void getBackgroundImage(OutputArray backgroundImage) const; virtual void getBackgroundImage(OutputArray backgroundImage) const CV_OVERRIDE;
//! re-initiaization method //! re-initiaization method
void initialize(Size _frameSize, int _frameType) void initialize(Size _frameSize, int _frameType)
...@@ -236,35 +236,35 @@ public: ...@@ -236,35 +236,35 @@ public:
} }
} }
virtual int getHistory() const { return history; } virtual int getHistory() const CV_OVERRIDE { return history; }
virtual void setHistory(int _nframes) { history = _nframes; } virtual void setHistory(int _nframes) CV_OVERRIDE { history = _nframes; }
virtual int getNMixtures() const { return nmixtures; } virtual int getNMixtures() const CV_OVERRIDE { return nmixtures; }
virtual void setNMixtures(int nmix) { nmixtures = nmix; } virtual void setNMixtures(int nmix) CV_OVERRIDE { nmixtures = nmix; }
virtual double getBackgroundRatio() const { return backgroundRatio; } virtual double getBackgroundRatio() const CV_OVERRIDE { return backgroundRatio; }
virtual void setBackgroundRatio(double _backgroundRatio) { backgroundRatio = (float)_backgroundRatio; } virtual void setBackgroundRatio(double _backgroundRatio) CV_OVERRIDE { backgroundRatio = (float)_backgroundRatio; }
virtual double getVarThreshold() const { return varThreshold; } virtual double getVarThreshold() const CV_OVERRIDE { return varThreshold; }
virtual void setVarThreshold(double _varThreshold) { varThreshold = _varThreshold; } virtual void setVarThreshold(double _varThreshold) CV_OVERRIDE { varThreshold = _varThreshold; }
virtual double getVarThresholdGen() const { return varThresholdGen; } virtual double getVarThresholdGen() const CV_OVERRIDE { return varThresholdGen; }
virtual void setVarThresholdGen(double _varThresholdGen) { varThresholdGen = (float)_varThresholdGen; } virtual void setVarThresholdGen(double _varThresholdGen) CV_OVERRIDE { varThresholdGen = (float)_varThresholdGen; }
virtual double getVarInit() const { return fVarInit; } virtual double getVarInit() const CV_OVERRIDE { return fVarInit; }
virtual void setVarInit(double varInit) { fVarInit = (float)varInit; } virtual void setVarInit(double varInit) CV_OVERRIDE { fVarInit = (float)varInit; }
virtual double getVarMin() const { return fVarMin; } virtual double getVarMin() const CV_OVERRIDE { return fVarMin; }
virtual void setVarMin(double varMin) { fVarMin = (float)varMin; } virtual void setVarMin(double varMin) CV_OVERRIDE { fVarMin = (float)varMin; }
virtual double getVarMax() const { return fVarMax; } virtual double getVarMax() const CV_OVERRIDE { return fVarMax; }
virtual void setVarMax(double varMax) { fVarMax = (float)varMax; } virtual void setVarMax(double varMax) CV_OVERRIDE { fVarMax = (float)varMax; }
virtual double getComplexityReductionThreshold() const { return fCT; } virtual double getComplexityReductionThreshold() const CV_OVERRIDE { return fCT; }
virtual void setComplexityReductionThreshold(double ct) { fCT = (float)ct; } virtual void setComplexityReductionThreshold(double ct) CV_OVERRIDE { fCT = (float)ct; }
virtual bool getDetectShadows() const { return bShadowDetection; } virtual bool getDetectShadows() const CV_OVERRIDE { return bShadowDetection; }
virtual void setDetectShadows(bool detectshadows) virtual void setDetectShadows(bool detectshadows) CV_OVERRIDE
{ {
if ((bShadowDetection && detectshadows) || (!bShadowDetection && !detectshadows)) if ((bShadowDetection && detectshadows) || (!bShadowDetection && !detectshadows))
return; return;
...@@ -278,13 +278,13 @@ public: ...@@ -278,13 +278,13 @@ public:
#endif #endif
} }
virtual int getShadowValue() const { return nShadowDetection; } virtual int getShadowValue() const CV_OVERRIDE { return nShadowDetection; }
virtual void setShadowValue(int value) { nShadowDetection = (uchar)value; } virtual void setShadowValue(int value) CV_OVERRIDE { nShadowDetection = (uchar)value; }
virtual double getShadowThreshold() const { return fTau; } virtual double getShadowThreshold() const CV_OVERRIDE { return fTau; }
virtual void setShadowThreshold(double value) { fTau = (float)value; } virtual void setShadowThreshold(double value) CV_OVERRIDE { fTau = (float)value; }
virtual void write(FileStorage& fs) const virtual void write(FileStorage& fs) const CV_OVERRIDE
{ {
writeFormat(fs); writeFormat(fs);
fs << "name" << name_ fs << "name" << name_
...@@ -302,7 +302,7 @@ public: ...@@ -302,7 +302,7 @@ public:
<< "shadowThreshold" << fTau; << "shadowThreshold" << fTau;
} }
virtual void read(const FileNode& fn) virtual void read(const FileNode& fn) CV_OVERRIDE
{ {
CV_Assert( (String)fn["name"] == name_ ); CV_Assert( (String)fn["name"] == name_ );
history = (int)fn["history"]; history = (int)fn["history"];
...@@ -565,7 +565,7 @@ public: ...@@ -565,7 +565,7 @@ public:
shadowVal = _shadowVal; shadowVal = _shadowVal;
} }
void operator()(const Range& range) const void operator()(const Range& range) const CV_OVERRIDE
{ {
int y0 = range.start, y1 = range.end; int y0 = range.start, y1 = range.end;
int ncols = src->cols, nchannels = src->channels(); int ncols = src->cols, nchannels = src->channels();
......
modules/video/src/lkpyramid.cpp
View file @ 1ca7ae96
...@@ -819,25 +819,25 @@ namespace ...@@ -819,25 +819,25 @@ namespace
{ {
} }
virtual Size getWinSize() const {return winSize;} virtual Size getWinSize() const CV_OVERRIDE { return winSize;}
virtual void setWinSize(Size winSize_){winSize = winSize_;} virtual void setWinSize(Size winSize_) CV_OVERRIDE { winSize = winSize_;}
virtual int getMaxLevel() const {return maxLevel;} virtual int getMaxLevel() const CV_OVERRIDE { return maxLevel;}
virtual void setMaxLevel(int maxLevel_){maxLevel = maxLevel_;} virtual void setMaxLevel(int maxLevel_) CV_OVERRIDE { maxLevel = maxLevel_;}
virtual TermCriteria getTermCriteria() const {return criteria;} virtual TermCriteria getTermCriteria() const CV_OVERRIDE { return criteria;}
virtual void setTermCriteria(TermCriteria& crit_){criteria=crit_;} virtual void setTermCriteria(TermCriteria& crit_) CV_OVERRIDE { criteria=crit_;}
virtual int getFlags() const {return flags; } virtual int getFlags() const CV_OVERRIDE { return flags; }
virtual void setFlags(int flags_){flags=flags_;} virtual void setFlags(int flags_) CV_OVERRIDE { flags=flags_;}
virtual double getMinEigThreshold() const {return minEigThreshold;} virtual double getMinEigThreshold() const CV_OVERRIDE { return minEigThreshold;}
virtual void setMinEigThreshold(double minEigThreshold_){minEigThreshold=minEigThreshold_;} virtual void setMinEigThreshold(double minEigThreshold_) CV_OVERRIDE { minEigThreshold=minEigThreshold_;}
virtual void calc(InputArray prevImg, InputArray nextImg, virtual void calc(InputArray prevImg, InputArray nextImg,
InputArray prevPts, InputOutputArray nextPts, InputArray prevPts, InputOutputArray nextPts,
OutputArray status, OutputArray status,
OutputArray err = cv::noArray()); OutputArray err = cv::noArray()) CV_OVERRIDE;
private: private:
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
......
modules/video/src/lkpyramid.hpp
View file @ 1ca7ae96
...@@ -15,7 +15,7 @@ namespace detail ...@@ -15,7 +15,7 @@ namespace detail
Size _winSize, TermCriteria _criteria, Size _winSize, TermCriteria _criteria,
int _level, int _maxLevel, int _flags, float _minEigThreshold ); int _level, int _maxLevel, int _flags, float _minEigThreshold );
void operator()(const Range& range) const; void operator()(const Range& range) const CV_OVERRIDE;
const Mat* prevImg; const Mat* prevImg;
const Mat* nextImg; const Mat* nextImg;
......
modules/video/src/optflowgf.cpp
View file @ 1ca7ae96
...@@ -597,31 +597,31 @@ public: ...@@ -597,31 +597,31 @@ public:
{ {
} }
virtual int getNumLevels() const { return numLevels_; } virtual int getNumLevels() const CV_OVERRIDE { return numLevels_; }
virtual void setNumLevels(int numLevels) { numLevels_ = numLevels; } virtual void setNumLevels(int numLevels) CV_OVERRIDE { numLevels_ = numLevels; }
virtual double getPyrScale() const { return pyrScale_; } virtual double getPyrScale() const CV_OVERRIDE { return pyrScale_; }
virtual void setPyrScale(double pyrScale) { pyrScale_ = pyrScale; } virtual void setPyrScale(double pyrScale) CV_OVERRIDE { pyrScale_ = pyrScale; }
virtual bool getFastPyramids() const { return fastPyramids_; } virtual bool getFastPyramids() const CV_OVERRIDE { return fastPyramids_; }
virtual void setFastPyramids(bool fastPyramids) { fastPyramids_ = fastPyramids; } virtual void setFastPyramids(bool fastPyramids) CV_OVERRIDE { fastPyramids_ = fastPyramids; }
virtual int getWinSize() const { return winSize_; } virtual int getWinSize() const CV_OVERRIDE { return winSize_; }
virtual void setWinSize(int winSize) { winSize_ = winSize; } virtual void setWinSize(int winSize) CV_OVERRIDE { winSize_ = winSize; }
virtual int getNumIters() const { return numIters_; } virtual int getNumIters() const CV_OVERRIDE { return numIters_; }
virtual void setNumIters(int numIters) { numIters_ = numIters; } virtual void setNumIters(int numIters) CV_OVERRIDE { numIters_ = numIters; }
virtual int getPolyN() const { return polyN_; } virtual int getPolyN() const CV_OVERRIDE { return polyN_; }
virtual void setPolyN(int polyN) { polyN_ = polyN; } virtual void setPolyN(int polyN) CV_OVERRIDE { polyN_ = polyN; }
virtual double getPolySigma() const { return polySigma_; } virtual double getPolySigma() const CV_OVERRIDE { return polySigma_; }
virtual void setPolySigma(double polySigma) { polySigma_ = polySigma; } virtual void setPolySigma(double polySigma) CV_OVERRIDE { polySigma_ = polySigma; }
virtual int getFlags() const { return flags_; } virtual int getFlags() const CV_OVERRIDE { return flags_; }
virtual void setFlags(int flags) { flags_ = flags; } virtual void setFlags(int flags) CV_OVERRIDE { flags_ = flags; }
virtual void calc(InputArray I0, InputArray I1, InputOutputArray flow); virtual void calc(InputArray I0, InputArray I1, InputOutputArray flow) CV_OVERRIDE;
private: private:
int numLevels_; int numLevels_;
...@@ -800,7 +800,7 @@ private: ...@@ -800,7 +800,7 @@ private:
flowy = curFlowY; flowy = curFlowY;
return true; return true;
} }
virtual void collectGarbage(){ virtual void collectGarbage() CV_OVERRIDE {
releaseMemory(); releaseMemory();
} }
void releaseMemory() void releaseMemory()
...@@ -1089,7 +1089,7 @@ private: ...@@ -1089,7 +1089,7 @@ private:
return true; return true;
} }
#else // HAVE_OPENCL #else // HAVE_OPENCL
virtual void collectGarbage(){} virtual void collectGarbage() CV_OVERRIDE {}
#endif #endif
}; };
......
modules/video/src/tvl1flow.cpp
View file @ 1ca7ae96
...@@ -102,21 +102,33 @@ public: ...@@ -102,21 +102,33 @@ public:
} }
OpticalFlowDual_TVL1(); OpticalFlowDual_TVL1();
void calc(InputArray I0, InputArray I1, InputOutputArray flow); void calc(InputArray I0, InputArray I1, InputOutputArray flow) CV_OVERRIDE;
void collectGarbage(); void collectGarbage() CV_OVERRIDE;
CV_IMPL_PROPERTY(double, Tau, tau) inline double getTau() const CV_OVERRIDE { return tau; }
CV_IMPL_PROPERTY(double, Lambda, lambda) inline void setTau(double val) CV_OVERRIDE { tau = val; }
CV_IMPL_PROPERTY(double, Theta, theta) inline double getLambda() const CV_OVERRIDE { return lambda; }
CV_IMPL_PROPERTY(double, Gamma, gamma) inline void setLambda(double val) CV_OVERRIDE { lambda = val; }
CV_IMPL_PROPERTY(int, ScalesNumber, nscales) inline double getTheta() const CV_OVERRIDE { return theta; }
CV_IMPL_PROPERTY(int, WarpingsNumber, warps) inline void setTheta(double val) CV_OVERRIDE { theta = val; }
CV_IMPL_PROPERTY(double, Epsilon, epsilon) inline double getGamma() const CV_OVERRIDE { return gamma; }
CV_IMPL_PROPERTY(int, InnerIterations, innerIterations) inline void setGamma(double val) CV_OVERRIDE { gamma = val; }
CV_IMPL_PROPERTY(int, OuterIterations, outerIterations) inline int getScalesNumber() const CV_OVERRIDE { return nscales; }
CV_IMPL_PROPERTY(bool, UseInitialFlow, useInitialFlow) inline void setScalesNumber(int val) CV_OVERRIDE { nscales = val; }
CV_IMPL_PROPERTY(double, ScaleStep, scaleStep) inline int getWarpingsNumber() const CV_OVERRIDE { return warps; }
CV_IMPL_PROPERTY(int, MedianFiltering, medianFiltering) inline void setWarpingsNumber(int val) CV_OVERRIDE { warps = val; }
inline double getEpsilon() const CV_OVERRIDE { return epsilon; }
inline void setEpsilon(double val) CV_OVERRIDE { epsilon = val; }
inline int getInnerIterations() const CV_OVERRIDE { return innerIterations; }
inline void setInnerIterations(int val) CV_OVERRIDE { innerIterations = val; }
inline int getOuterIterations() const CV_OVERRIDE { return outerIterations; }
inline void setOuterIterations(int val) CV_OVERRIDE { outerIterations = val; }
inline bool getUseInitialFlow() const CV_OVERRIDE { return useInitialFlow; }
inline void setUseInitialFlow(bool val) CV_OVERRIDE { useInitialFlow = val; }
inline double getScaleStep() const CV_OVERRIDE { return scaleStep; }
inline void setScaleStep(double val) CV_OVERRIDE { scaleStep = val; }
inline int getMedianFiltering() const CV_OVERRIDE { return medianFiltering; }
inline void setMedianFiltering(int val) CV_OVERRIDE { medianFiltering = val; }
protected: protected:
double tau; double tau;
...@@ -628,7 +640,7 @@ bool OpticalFlowDual_TVL1::calc_ocl(InputArray _I0, InputArray _I1, InputOutputA ...@@ -628,7 +640,7 @@ bool OpticalFlowDual_TVL1::calc_ocl(InputArray _I0, InputArray _I1, InputOutputA
struct BuildFlowMapBody : ParallelLoopBody struct BuildFlowMapBody : ParallelLoopBody
{ {
void operator() (const Range& range) const; void operator() (const Range& range) const CV_OVERRIDE;
Mat_<float> u1; Mat_<float> u1;
Mat_<float> u2; Mat_<float> u2;
...@@ -675,7 +687,7 @@ void buildFlowMap(const Mat_<float>& u1, const Mat_<float>& u2, Mat_<float>& map ...@@ -675,7 +687,7 @@ void buildFlowMap(const Mat_<float>& u1, const Mat_<float>& u2, Mat_<float>& map
struct CenteredGradientBody : ParallelLoopBody struct CenteredGradientBody : ParallelLoopBody
{ {
void operator() (const Range& range) const; void operator() (const Range& range) const CV_OVERRIDE;
Mat_<float> src; Mat_<float> src;
mutable Mat_<float> dx; mutable Mat_<float> dx;
...@@ -762,7 +774,7 @@ void centeredGradient(const Mat_<float>& src, Mat_<float>& dx, Mat_<float>& dy) ...@@ -762,7 +774,7 @@ void centeredGradient(const Mat_<float>& src, Mat_<float>& dx, Mat_<float>& dy)
struct ForwardGradientBody : ParallelLoopBody struct ForwardGradientBody : ParallelLoopBody
{ {
void operator() (const Range& range) const; void operator() (const Range& range) const CV_OVERRIDE;
Mat_<float> src; Mat_<float> src;
mutable Mat_<float> dx; mutable Mat_<float> dx;
...@@ -832,7 +844,7 @@ void forwardGradient(const Mat_<float>& src, Mat_<float>& dx, Mat_<float>& dy) ...@@ -832,7 +844,7 @@ void forwardGradient(const Mat_<float>& src, Mat_<float>& dx, Mat_<float>& dy)
struct DivergenceBody : ParallelLoopBody struct DivergenceBody : ParallelLoopBody
{ {
void operator() (const Range& range) const; void operator() (const Range& range) const CV_OVERRIDE;
Mat_<float> v1; Mat_<float> v1;
Mat_<float> v2; Mat_<float> v2;
...@@ -891,7 +903,7 @@ void divergence(const Mat_<float>& v1, const Mat_<float>& v2, Mat_<float>& div) ...@@ -891,7 +903,7 @@ void divergence(const Mat_<float>& v1, const Mat_<float>& v2, Mat_<float>& div)
struct CalcGradRhoBody : ParallelLoopBody struct CalcGradRhoBody : ParallelLoopBody
{ {
void operator() (const Range& range) const; void operator() (const Range& range) const CV_OVERRIDE;
Mat_<float> I0; Mat_<float> I0;
Mat_<float> I1w; Mat_<float> I1w;
...@@ -961,7 +973,7 @@ void calcGradRho(const Mat_<float>& I0, const Mat_<float>& I1w, const Mat_<float ...@@ -961,7 +973,7 @@ void calcGradRho(const Mat_<float>& I0, const Mat_<float>& I1w, const Mat_<float
struct EstimateVBody : ParallelLoopBody struct EstimateVBody : ParallelLoopBody
{ {
void operator() (const Range& range) const; void operator() (const Range& range) const CV_OVERRIDE;
Mat_<float> I1wx; Mat_<float> I1wx;
Mat_<float> I1wy; Mat_<float> I1wy;
...@@ -1108,7 +1120,7 @@ float estimateU(const Mat_<float>& v1, const Mat_<float>& v2, const Mat_<float>& ...@@ -1108,7 +1120,7 @@ float estimateU(const Mat_<float>& v1, const Mat_<float>& v2, const Mat_<float>&
struct EstimateDualVariablesBody : ParallelLoopBody struct EstimateDualVariablesBody : ParallelLoopBody
{ {
void operator() (const Range& range) const; void operator() (const Range& range) const CV_OVERRIDE;
Mat_<float> u1x; Mat_<float> u1x;
Mat_<float> u1y; Mat_<float> u1y;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment