fix the haar kernel problems on Nvidia and Intel OCL

720eaf1e · yao · e6dd4e84 · 720eaf1e · 720eaf1e
展开全部隐藏空白更改
内联并排

Showing with 208 addition and 203 deletion

modules/ocl/src/haar.cpp modules/ocl/src/haar.cpp +1 -1

modules/ocl/src/kernels/haarobjectdetect.cl modules/ocl/src/kernels/haarobjectdetect.cl +207 -202

未找到文件。
--- a/modules/ocl/src/haar.cpp
+++ b/modules/ocl/src/haar.cpp
@@ -926,7 +926,7 @@ CvSeq *cv::ocl::OclCascadeClassifier::oclHaarDetectObjects( oclMat &gimg, CvMemS
    if( gimg.cols < minSize.width || gimg.rows < minSize.height )
        CV_Error(CV_StsError, "Image too small");

-    if( (flags & CV_HAAR_SCALE_IMAGE) && gimg.clCxt->impl->devName.find("Intel(R) HD Graphics") == string::npos )
+    if( (flags & CV_HAAR_SCALE_IMAGE) )
    {
        CvSize winSize0 = cascade->orig_window_size;
        //float scalefactor = 1.1f;

--- a/modules/ocl/src/kernels/haarobjectdetect.cl
+++ b/modules/ocl/src/kernels/haarobjectdetect.cl