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

Merge pull request #5714 from ajbernal:OCL_HOG_Fix

Browse Source
This commit is contained in:
Alexander Alekhin
2015-11-30 09:44:37 +00:00
parent 7ddc2cc073 5c8683139f
commit e860ed7689
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1224,7 +1224,7 @@ static bool ocl_normalize_hists(int nbins, int block_stride_x, int block_stride_
} }
else else
{ {
k.create("normalize_hists_kernel", ocl::objdetect::objdetect_hog_oclsrc, ""); k.create("normalize_hists_kernel", ocl::objdetect::objdetect_hog_oclsrc, "-D WAVE_SIZE=32");
if(k.empty()) if(k.empty())
return false; return false;
if(is_cpu) if(is_cpu)
@@ -1651,7 +1651,7 @@ static bool ocl_classify_hists(int win_height, int win_width, int block_stride_y
{ {
case 180: case 180:
nthreads = 180; nthreads = 180;
k.create("classify_hists_180_kernel", ocl::objdetect::objdetect_hog_oclsrc, ""); k.create("classify_hists_180_kernel", ocl::objdetect::objdetect_hog_oclsrc, "-D WAVE_SIZE=32");
if(k.empty()) if(k.empty())
return false; return false;
if(is_cpu) if(is_cpu)
@@ -1667,7 +1667,7 @@ static bool ocl_classify_hists(int win_height, int win_width, int block_stride_y
case 252: case 252:
nthreads = 256; nthreads = 256;
k.create("classify_hists_252_kernel", ocl::objdetect::objdetect_hog_oclsrc, ""); k.create("classify_hists_252_kernel", ocl::objdetect::objdetect_hog_oclsrc, "-D WAVE_SIZE=32");
if(k.empty()) if(k.empty())
return false; return false;
if(is_cpu) if(is_cpu)
@@ -1683,7 +1683,7 @@ static bool ocl_classify_hists(int win_height, int win_width, int block_stride_y
default: default:
nthreads = 256; nthreads = 256;
k.create("classify_hists_kernel", ocl::objdetect::objdetect_hog_oclsrc, ""); k.create("classify_hists_kernel", ocl::objdetect::objdetect_hog_oclsrc, "-D WAVE_SIZE=32");
if(k.empty()) if(k.empty())
return false; return false;
if(is_cpu) if(is_cpu)