generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4023 from Dikay900:cleanup_cascadedetect

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-05-18 14:08:22 +00:00
commit 3136010e1a
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/objdetect/src/cascadedetect.cpp
View File

@ -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);

1
modules/objdetect/src/cascadedetect.hpp
View File

@ -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;