Merge branch 'kepler-optimization' into cuda-dev

2012-11-27 16:34:45 +04:00
parent 22b0ea1cf0 2eca75ccdd
commit d2591704e8
40 changed files with 9416 additions and 8391 deletions
--- a/modules/gpu/perf/perf_imgproc.cpp
+++ b/modules/gpu/perf/perf_imgproc.cpp
@@ -581,13 +581,12 @@ PERF_TEST_P(Sz, ImgProc_CalcHist, GPU_TYPICAL_MAT_SIZES)
    {
        cv::gpu::GpuMat d_src(src);
        cv::gpu::GpuMat d_hist;
-        cv::gpu::GpuMat d_buf;

-        cv::gpu::calcHist(d_src, d_hist, d_buf);
+        cv::gpu::calcHist(d_src, d_hist);

        TEST_CYCLE()
        {
-            cv::gpu::calcHist(d_src, d_hist, d_buf);
+            cv::gpu::calcHist(d_src, d_hist);
        }

        GPU_SANITY_CHECK(d_hist);