Merge pull request #4023 from Dikay900:cleanup_cascadedetect

pull/4027/head^2
Vadim Pisarevsky 10 years ago
commit 3136010e1a
  1. 4
      modules/objdetect/src/cascadedetect.cpp
  2. 1
      modules/objdetect/src/cascadedetect.hpp

@ -679,10 +679,6 @@ void HaarEvaluator::computeOptFeatures()
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 )
{
const ScaleData& s = getScaleData(scaleIdx);

@ -347,7 +347,6 @@ public:
virtual Ptr<FeatureEvaluator> clone() const;
virtual int getFeatureType() const { return FeatureEvaluator::HAAR; }
virtual bool setImage(InputArray _image, const std::vector<float>& _scales);
virtual bool setWindow(Point p, int scaleIdx);
Rect getNormRect() const;
int getSquaresOffset() const;

Loading…
Cancel
Save