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

perf test

Browse Source
This commit is contained in:
Konstantin Matskevich
2014-01-30 16:26:54 +04:00
parent 9a62df1650
commit 3ea32b87bb
3 changed files with 113 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1377,7 +1377,7 @@ void HOGDescriptor::compute(InputArray _img, std::vector<float>& descriptors,
padding.height = (int)alignSize(std::max(padding.height, 0), cacheStride.height);
Size paddedImgSize(imgSize.width + padding.width*2, imgSize.height + padding.height*2);
if(ocl::useOpenCL() && _img.dims() <= 2 && _img.type() == CV_8UC1 && _img.isUMat() &&
if(ocl::useOpenCL() && _img.dims() <= 2 && _img.type() == CV_8UC1 && _img.isUMat() &&
ocl_compute(_img, winStride, descriptors, DESCR_FORMAT_COL_BY_COL))
return;
@@ -1713,7 +1713,7 @@ bool HOGDescriptor::ocl_detect(const UMat& img, std::vector<Point> &hits,
effect_size.width, block_hists, (float)L2HysThreshold)) return false;
size_t descriptor_size = getDescriptorSize();
float free_coef = free_coef = svmDetector.size() > descriptor_size ? svmDetector[descriptor_size] : 0;
float free_coef = svmDetector.size() > descriptor_size ? svmDetector[descriptor_size] : 0;
Size blocks_per_win = numPartsWithin(winSize, blockSize, blockStride);