potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

core: apply CV_OVERRIDE/CV_FINAL

Browse Source
This commit is contained in:
Alexander Alekhin
2018-03-15 16:16:50 +03:00
parent 0587f92d96
commit 9111538bfb
17 changed files with 134 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/downhill_simplex.cpp
+8 -8
View File
@@ -140,7 +140,7 @@ multiple lines in three dimensions as not all lines intersect in three dimension
namespace cv
{
class DownhillSolverImpl : public DownhillSolver
class DownhillSolverImpl CV_FINAL : public DownhillSolver
{
public:
DownhillSolverImpl()
@@ -149,8 +149,8 @@ public:
_step=Mat_<double>();
}
void getInitStep(OutputArray step) const { _step.copyTo(step); }
void setInitStep(InputArray step)
void getInitStep(OutputArray step) const CV_OVERRIDE { _step.copyTo(step); }
void setInitStep(InputArray step) CV_OVERRIDE
{
// set dimensionality and make a deep copy of step
Mat m = step.getMat();
@@ -161,13 +161,13 @@ public:
transpose(m, _step);
}
Ptr<MinProblemSolver::Function> getFunction() const { return _Function; }
Ptr<MinProblemSolver::Function> getFunction() const CV_OVERRIDE { return _Function; }
void setFunction(const Ptr<Function>& f) { _Function=f; }
void setFunction(const Ptr<Function>& f) CV_OVERRIDE { _Function=f; }
TermCriteria getTermCriteria() const { return _termcrit; }
TermCriteria getTermCriteria() const CV_OVERRIDE { return _termcrit; }
void setTermCriteria( const TermCriteria& termcrit )
void setTermCriteria( const TermCriteria& termcrit ) CV_OVERRIDE
{
CV_Assert( termcrit.type == (TermCriteria::MAX_ITER + TermCriteria::EPS) &&
termcrit.epsilon > 0 &&
@@ -175,7 +175,7 @@ public:
_termcrit=termcrit;
}
double minimize( InputOutputArray x_ )
double minimize( InputOutputArray x_ ) CV_OVERRIDE
{
dprintf(("hi from minimize\n"));
CV_Assert( !_Function.empty() );