Commit 3136010e authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

Merge pull request #4023 from Dikay900:cleanup_cascadedetect

parents 2fc92448 a5242265
...@@ -679,10 +679,6 @@ void HaarEvaluator::computeOptFeatures() ...@@ -679,10 +679,6 @@ void HaarEvaluator::computeOptFeatures()
copyVectorToUMat(*optfeatures_lbuf, ufbuf); copyVectorToUMat(*optfeatures_lbuf, ufbuf);
} }
bool HaarEvaluator::setImage(InputArray _image, const std::vector<float>& _scales){
return FeatureEvaluator::setImage(_image, _scales);
}
bool HaarEvaluator::setWindow( Point pt, int scaleIdx ) bool HaarEvaluator::setWindow( Point pt, int scaleIdx )
{ {
const ScaleData& s = getScaleData(scaleIdx); const ScaleData& s = getScaleData(scaleIdx);
......
...@@ -347,7 +347,6 @@ public: ...@@ -347,7 +347,6 @@ public:
virtual Ptr<FeatureEvaluator> clone() const; virtual Ptr<FeatureEvaluator> clone() const;
virtual int getFeatureType() const { return FeatureEvaluator::HAAR; } virtual int getFeatureType() const { return FeatureEvaluator::HAAR; }
virtual bool setImage(InputArray _image, const std::vector<float>& _scales);
virtual bool setWindow(Point p, int scaleIdx); virtual bool setWindow(Point p, int scaleIdx);
Rect getNormRect() const; Rect getNormRect() const;
int getSquaresOffset() const; int getSquaresOffset() const;
......
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