Merge pull request #3561 from jet47:cuda-arithm-refactoring

2015-01-15 11:44:35 +00:00
parent c58373dbea b4e7ee46c6
commit 16b56e71d9
34 changed files with 1404 additions and 713 deletions
--- a/modules/cuda/src/cascadeclassifier.cpp
+++ b/modules/cuda/src/cascadeclassifier.cpp
@@ -454,11 +454,10 @@ public:
                // create sutable matrix headers
                GpuMat src  = resuzeBuffer(cv::Rect(0, 0, level.sFrame.width, level.sFrame.height));
                GpuMat sint = integral(cv::Rect(prev, 0, level.sFrame.width + 1, level.sFrame.height + 1));
-                GpuMat buff = integralBuffer;

                // generate integral for scale
                cuda::resize(image, src, level.sFrame, 0, 0, cv::INTER_LINEAR);
-                cuda::integral(src, sint, buff);
+                cuda::integral(src, sint);

                // calculate job
                int totalWidth = level.workArea.width / step;