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

fixed bug in gpu::HOGDescriptor::computeConfidenceMultiScale

Browse Source
This commit is contained in:
Vladislav Vinogradov 2012-10-12 12:47:07 +04:00
parent 8abcad6b00
commit 304714862f
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
modules/gpu/src/hog.cpp
View File

@ -311,50 +311,51 @@ void cv::gpu::HOGDescriptor::computeConfidenceMultiScale(const GpuMat& img, vect
double hit_threshold, Size win_stride, Size padding, double hit_threshold, Size win_stride, Size padding,
vector<HOGConfidence> &conf_out, int group_threshold) vector<HOGConfidence> &conf_out, int group_threshold)
{ {
vector<double> level_scale; vector<double> level_scale;
double scale = 1.; double scale = 1.;
int levels = 0; int levels = 0;
for (levels = 0; levels < (int)conf_out.size(); levels++) for (levels = 0; levels < (int)conf_out.size(); levels++)
{ {
scale = conf_out[levels].scale; scale = conf_out[levels].scale;
level_scale.push_back(scale); level_scale.push_back(scale);
if (cvRound(img.cols/scale) < win_size.width || if (cvRound(img.cols/scale) < win_size.width || cvRound(img.rows/scale) < win_size.height)
cvRound(img.rows/scale) < win_size.height) break;
break;
} }
levels = std::max(levels, 1); levels = std::max(levels, 1);
level_scale.resize(levels); level_scale.resize(levels);
std::vector<Rect> all_candidates; std::vector<Rect> all_candidates;
vector<Point> locations; vector<Point> locations;
for (size_t i = 0; i < level_scale.size(); i++) for (size_t i = 0; i < level_scale.size(); i++)
{ {
double _scale = level_scale[i]; scale = level_scale[i];
Size sz(cvRound(img.cols / _scale), cvRound(img.rows / _scale)); Size sz(cvRound(img.cols / scale), cvRound(img.rows / scale));
GpuMat smaller_img; GpuMat smaller_img;
if (sz == img.size()) if (sz == img.size())
smaller_img = img; smaller_img = img;
else else
{ {
smaller_img.create(sz, img.type()); smaller_img.create(sz, img.type());
switch (img.type()) { switch (img.type())
case CV_8UC1: hog::resize_8UC1(img, smaller_img); break; {
case CV_8UC4: hog::resize_8UC4(img, smaller_img); break; case CV_8UC1: hog::resize_8UC1(img, smaller_img); break;
} case CV_8UC4: hog::resize_8UC4(img, smaller_img); break;
} }
}
computeConfidence(smaller_img, locations, hit_threshold, win_stride, padding, conf_out[i].locations, conf_out[i].confidences); computeConfidence(smaller_img, locations, hit_threshold, win_stride, padding, conf_out[i].locations, conf_out[i].confidences);
Size scaled_win_size(cvRound(win_size.width * scale), cvRound(win_size.height * scale)); Size scaled_win_size(cvRound(win_size.width * scale), cvRound(win_size.height * scale));
for (size_t j = 0; j < locations.size(); j++) for (size_t j = 0; j < locations.size(); j++)
all_candidates.push_back(Rect(Point2d((CvPoint)locations[j]) * scale, scaled_win_size)); all_candidates.push_back(Rect(Point2d((CvPoint)locations[j]) * scale, scaled_win_size));
} }
found_locations.assign(all_candidates.begin(), all_candidates.end());
groupRectangles(found_locations, group_threshold, 0.2/*magic number copied from CPU version*/); found_locations.assign(all_candidates.begin(), all_candidates.end());
groupRectangles(found_locations, group_threshold, 0.2/*magic number copied from CPU version*/);
} }