fixed HOG detector

git-svn-id: https://code.ros.org/svn/opencv/trunk@2953 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/src/cvaux/cvhog.cpp b/opencv/src/cvaux/cvhog.cpp
index a3bc42d30a7e5357eebe52e90aa83f70045b7dc0..cf8f27f4f82a2eb552e1b6d6d97cc9e676cc5ca0 100644 (file)
--- a/opencv/src/cvaux/cvhog.cpp
+++ b/opencv/src/cvaux/cvhog.cpp
@@ -844,9 +844,10 @@ void HOGDescriptor::detectMultiScale(
 {
     double scale = 1.;
     const int maxLevels = 64;
+    int levels = 0;
 
     vector<double> levelScale;
-    for( int levels = 0; levels < maxLevels; levels++ )
+    for( levels = 0; levels < maxLevels; levels++ )
     {
         levelScale.push_back(scale);
         if( cvRound(img.cols/scale) < winSize.width ||
@@ -855,6 +856,8 @@ void HOGDescriptor::detectMultiScale(
             break;
         scale *= scale0;
     }
+    levels = std::max(levels, 1);
+    levelScale.resize(levels);
 
     ConcurrentRectVector allCandidates;