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

Merge pull request #3869 from Dikay900:remove_unused_variable

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-04-02 11:48:43 +00:00
commit 246b7abe7e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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