Merge pull request #3849 from Dikay900:fix_tilted_features_crash

pull/3870/head
Vadim Pisarevsky 10 years ago
commit 3c51fdffac
  1. 5
      modules/objdetect/src/cascadedetect.cpp
  2. 1
      modules/objdetect/src/cascadedetect.hpp

@ -555,6 +555,7 @@ HaarEvaluator::HaarEvaluator()
localSize = Size(4, 2); localSize = Size(4, 2);
lbufSize = Size(0, 0); lbufSize = Size(0, 0);
nchannels = 0; nchannels = 0;
tofs = 0;
} }
HaarEvaluator::~HaarEvaluator() HaarEvaluator::~HaarEvaluator()
@ -676,6 +677,10 @@ void HaarEvaluator::computeOptFeatures()
copyVectorToUMat(*optfeatures_lbuf, ufbuf); 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 ) bool HaarEvaluator::setWindow( Point pt, int scaleIdx )
{ {

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

Loading…
Cancel
Save