initialize tiltedOffset variable at correct location

do not use this variable if it is not an tilted feature
pull/3869/head
Dikay900 10 years ago
parent 5ab26e3202
commit 952f9dbe62
  1. 6
      modules/objdetect/src/cascadedetect.cpp

@ -618,8 +618,7 @@ Ptr<FeatureEvaluator> HaarEvaluator::clone() const
void HaarEvaluator::computeChannels(int scaleIdx, InputArray img) void HaarEvaluator::computeChannels(int scaleIdx, InputArray img)
{ {
const ScaleData& s = scaleData->at(scaleIdx); const ScaleData& s = scaleData->at(scaleIdx);
tofs = (int)sbufSize.area(); sqofs = hasTiltedFeatures ? sbufSize.area() * 2 : sbufSize.area();
sqofs = hasTiltedFeatures ? tofs*2 : tofs;
if (img.isUMat()) if (img.isUMat())
{ {
@ -660,6 +659,9 @@ void HaarEvaluator::computeChannels(int scaleIdx, InputArray img)
void HaarEvaluator::computeOptFeatures() void HaarEvaluator::computeOptFeatures()
{ {
if (hasTiltedFeatures)
tofs = sbufSize.area();
int sstep = sbufSize.width; int sstep = sbufSize.width;
CV_SUM_OFS( nofs[0], nofs[1], nofs[2], nofs[3], 0, normrect, sstep ); CV_SUM_OFS( nofs[0], nofs[1], nofs[2], nofs[3], 0, normrect, sstep );

Loading…
Cancel
Save