Merge pull request #3467 from Dikay900:fix_gpu_surf_perf_test_cpu_part

2f4c11b5 · Vadim Pisarevsky · 7106d3e8 · 44f629f9 · 2f4c11b5
Commit 2f4c11b5 authored Dec 01, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

tests.cpp samples/gpu/performance/tests.cpp +3 -3

No files found.
--- a/samples/gpu/performance/tests.cpp
+++ b/samples/gpu/performance/tests.cpp
@@ -284,14 +284,14 @@ TEST(SURF)
    Mat src = imread(abspath("../data/aloeL.jpg"), IMREAD_GRAYSCALE);
    if (src.empty()) throw runtime_error("can't open ../data/aloeL.jpg");
-    xfeatures2d::SURF surf;
+    Ptr<Feature2D> surf = xfeatures2d::SURF::create();
    vector<KeyPoint> keypoints;
    Mat descriptors;
-    surf(src, Mat(), keypoints, descriptors);
+    surf->detectAndCompute(src, Mat(), keypoints, descriptors);
    CPU_ON;
-    surf(src, Mat(), keypoints, descriptors);
+    surf->detectAndCompute(src, Mat(), keypoints, descriptors);
    CPU_OFF;
    cuda::SURF_CUDA d_surf;