Revert "Revert "Merge pull request #836 from jet47:gpu-modules""

2013-06-04 13:32:35 +04:00
parent 10340fe234
commit 3eeaa9189c
472 changed files with 29894 additions and 23019 deletions
--- a/modules/softcascade/src/detector_cuda.cpp
+++ b/modules/softcascade/src/detector_cuda.cpp
@@ -537,7 +537,7 @@ void cv::softcascade::SCascade::detect(InputArray _image, InputArray _rois, Outp
            flds.createLevels(image.rows, image.cols);

        flds.preprocessor->apply(image, flds.shrunk);
-        integral(flds.shrunk, flds.hogluv, flds.integralBuffer, s);
+        ::integral(flds.shrunk, flds.hogluv, flds.integralBuffer, s);
    }
    else
    {