Merge pull request #3849 from Dikay900:fix_tilted_features_crash

This commit is contained in:
Vadim Pisarevsky 2015-03-24 15:19:13 +00:00
commit 3c51fdffac
2 changed files with 6 additions and 0 deletions

View File

@ -555,6 +555,7 @@ HaarEvaluator::HaarEvaluator()
localSize = Size(4, 2);
lbufSize = Size(0, 0);
nchannels = 0;
tofs = 0;
}
HaarEvaluator::~HaarEvaluator()
@ -676,6 +677,10 @@ void HaarEvaluator::computeOptFeatures()
copyVectorToUMat(*optfeatures_lbuf, ufbuf);
}
bool HaarEvaluator::setImage(InputArray _image, const std::vector<float>& _scales){
tofs = 0;
return FeatureEvaluator::setImage(_image, _scales);
}
bool HaarEvaluator::setWindow( Point pt, int scaleIdx )
{

View File

@ -347,6 +347,7 @@ 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;