From e12496d1504e6d1867882c4232a871e849fa82bf Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Mon, 22 Jul 2013 15:31:14 +0400 Subject: [PATCH] removed gpu name usage from ocl module --- modules/ocl/test/test_moments.cpp | 8 ++++---- modules/ocl/test/utility.cpp | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/ocl/test/test_moments.cpp b/modules/ocl/test/test_moments.cpp index 50b8379..f9bc4af 100644 --- a/modules/ocl/test/test_moments.cpp +++ b/modules/ocl/test/test_moments.cpp @@ -23,12 +23,12 @@ PARAM_TEST_CASE(MomentsTest, MatType, bool) mat1 = randomMat(rng, size, type, 5, 16, false); } - void Compare(Moments& cpu, Moments& gpu) + void Compare(Moments& cpu_moments, Moments& gpu_moments) { Mat gpu_dst, cpu_dst; - HuMoments(cpu, cpu_dst); - HuMoments(gpu, gpu_dst); - EXPECT_MAT_NEAR(gpu_dst,cpu_dst, .5); + HuMoments(cpu_moments, cpu_dst); + HuMoments(gpu_moments, gpu_dst); + EXPECT_MAT_NEAR(gpu_dst, cpu_dst, .5); } }; diff --git a/modules/ocl/test/utility.cpp b/modules/ocl/test/utility.cpp index a5fcc02..5b4e7b8 100644 --- a/modules/ocl/test/utility.cpp +++ b/modules/ocl/test/utility.cpp @@ -43,7 +43,6 @@ #define VARNAME(A) #A using namespace std; using namespace cv; -using namespace cv::gpu; using namespace cvtest; -- 2.7.4