dpm: apply CV_OVERRIDE/CV_FINAL

pull/1588/head
Alexander Alekhin 7 years ago
parent 55767bfcda
commit 14341291b0
  1. 2
      modules/dpm/src/dpm_cascade.hpp
  2. 12
      modules/dpm/src/dpm_cascade_detector.cpp
  3. 2
      modules/dpm/src/dpm_feature.hpp
  4. 8
      modules/dpm/src/dpm_model.hpp

@ -141,7 +141,7 @@ class ParalComputeRootPCAScores : public ParallelLoopBody
int dim, std::vector< Mat > &scores);
// parallel loop body
void operator() (const Range &range) const;
void operator() (const Range &range) const CV_OVERRIDE;
ParalComputeRootPCAScores(const ParalComputeRootPCAScores &pComp);

@ -49,19 +49,19 @@ namespace cv
namespace dpm
{
class DPMDetectorImpl : public DPMDetector
class DPMDetectorImpl CV_FINAL : public DPMDetector
{
public:
DPMDetectorImpl( const vector<string>& filenames, const vector<string>& classNames=vector<string>() );
~DPMDetectorImpl();
~DPMDetectorImpl() CV_OVERRIDE;
bool isEmpty() const;
bool isEmpty() const CV_OVERRIDE;
void detect(Mat &image, CV_OUT vector<ObjectDetection>& objects);
void detect(Mat &image, CV_OUT vector<ObjectDetection>& objects) CV_OVERRIDE;
const vector<string>& getClassNames() const;
size_t getClassCount() const;
const vector<string>& getClassNames() const CV_OVERRIDE;
size_t getClassCount() const CV_OVERRIDE;
string extractModelName( const string& filename );
private:

@ -153,7 +153,7 @@ class ParalComputePyramid : public ParallelLoopBody
void initialize();
// parallel loop body
void operator() (const Range &range) const;
void operator() (const Range &range) const CV_OVERRIDE;
private:
// image to compute feature pyramid

@ -130,11 +130,11 @@ class CascadeModel : public Model
std::vector< Mat > partPCAFilters;
public:
CascadeModel() {}
~CascadeModel() {}
~CascadeModel() CV_OVERRIDE {}
void initModel();
bool serialize(const std::string &filename) const;
bool deserialize(const std::string &filename);
void initModel() CV_OVERRIDE;
bool serialize(const std::string &filename) const CV_OVERRIDE;
bool deserialize(const std::string &filename) CV_OVERRIDE;
};
} // namespace lsvm

Loading…
Cancel
Save