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

Merge pull request #4074 from vpisarev:objdetect_fixes

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-05-28 19:43:51 +00:00
parent 8b8fc9e66b 882c0321f4
commit b46719b093
9 changed files with 331 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,7 @@
//M*/
#include "precomp.hpp"
#include "cascadedetect.hpp"
#include "opencv2/core/core_c.h"
#include "opencl_kernels_objdetect.hpp"
@@ -1823,7 +1824,9 @@ static bool ocl_detectMultiScale(InputArray _img, std::vector<Rect> &found_locat
all_candidates.push_back(Rect(Point2d(locations[j]) * scale, scaled_win_size));
}
found_locations.assign(all_candidates.begin(), all_candidates.end());
cv::groupRectangles(found_locations, (int)group_threshold, 0.2);
groupRectangles(found_locations, (int)group_threshold, 0.2);
clipObjects(imgSize, found_locations, 0, 0);
return true;
}
#endif //HAVE_OPENCL
@@ -1879,6 +1882,7 @@ void HOGDescriptor::detectMultiScale(
groupRectangles_meanshift(foundLocations, foundWeights, foundScales, finalThreshold, winSize);
else
groupRectangles(foundLocations, foundWeights, (int)finalThreshold, 0.2);
clipObjects(imgSize, foundLocations, 0, &foundWeights);
}
void HOGDescriptor::detectMultiScale(InputArray img, std::vector<Rect>& foundLocations,