diff --git a/modules/ocl/test/test_arithm.cpp b/modules/ocl/test/test_arithm.cpp index e23b3d104a..9b9cec9381 100644 --- a/modules/ocl/test/test_arithm.cpp +++ b/modules/ocl/test/test_arithm.cpp @@ -172,14 +172,26 @@ PARAM_TEST_CASE(ArithmTestBase, MatType, bool) gmask = mask_roi; //end } + void Near(double threshold = 0.) + { + cv::Mat cpu_dst; + gdst_whole.download(cpu_dst); + EXPECT_MAT_NEAR(dst, cpu_dst, threshold); + } + + void Near1(double threshold = 0.) + { + cv::Mat cpu_dst1; + gdst1_whole.download(cpu_dst1); + EXPECT_MAT_NEAR(dst1, cpu_dst1, threshold); + } + }; ////////////////////////////////lut///////////////////////////////////////////////// - struct Lut : ArithmTestBase {}; #define VARNAME(A) string(#A); - TEST_P(Lut, Mat) { @@ -200,10 +212,7 @@ TEST_P(Lut, Mat) cv::LUT(mat1_roi, mat2_roi, dst_roi); cv::ocl::LUT(gmat1, gmat2, gdst); - - cv::Mat cpu_dst; - gdst_whole.download (cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 0, ""); + Near(0); } } @@ -219,12 +228,7 @@ TEST_P(Exp, Mat) cv::exp(mat1_roi, dst_roi); cv::ocl::exp(gmat1, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 2, ""); - + Near(2); } } @@ -240,10 +244,7 @@ TEST_P(Log, Mat) cv::log(mat1_roi, dst_roi); cv::ocl::log(gmat1, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 1, ""); + Near(1); } } @@ -259,10 +260,7 @@ TEST_P(Add, Mat) cv::add(mat1_roi, mat2_roi, dst_roi); cv::ocl::add(gmat1, gmat2, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 0.0, ""); + Near(0); } } @@ -274,12 +272,10 @@ TEST_P(Add, Mat_Mask) cv::add(mat1_roi, mat2_roi, dst_roi, mask_roi); cv::ocl::add(gmat1, gmat2, gdst, gmask); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 0.0, ""); + Near(0); } } + TEST_P(Add, Scalar) { for(int j = 0; j < LOOP_TIMES; j++) @@ -288,10 +284,7 @@ TEST_P(Add, Scalar) cv::add(mat1_roi, val, dst_roi); cv::ocl::add(gmat1, val, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } @@ -303,10 +296,7 @@ TEST_P(Add, Scalar_Mask) cv::add(mat1_roi, val, dst_roi, mask_roi); cv::ocl::add(gmat1, val, gdst, gmask); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } @@ -323,10 +313,7 @@ TEST_P(Sub, Mat) cv::subtract(mat1_roi, mat2_roi, dst_roi); cv::ocl::subtract(gmat1, gmat2, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 0.0, ""); + Near(0); } } @@ -338,10 +325,7 @@ TEST_P(Sub, Mat_Mask) cv::subtract(mat1_roi, mat2_roi, dst_roi, mask_roi); cv::ocl::subtract(gmat1, gmat2, gdst, gmask); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 0.0, ""); + Near(0); } } @@ -353,10 +337,7 @@ TEST_P(Sub, Scalar) cv::subtract(mat1_roi, val, dst_roi); cv::ocl::subtract(gmat1, val, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } @@ -368,10 +349,7 @@ TEST_P(Sub, Scalar_Mask) cv::subtract(mat1_roi, val, dst_roi, mask_roi); cv::ocl::subtract(gmat1, val, gdst, gmask); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } @@ -388,10 +366,7 @@ TEST_P(Mul, Mat) cv::multiply(mat1_roi, mat2_roi, dst_roi); cv::ocl::multiply(gmat1, gmat2, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 0.0, ""); + Near(0); } } @@ -406,10 +381,7 @@ TEST_P(Mul, Mat_Scalar) cv::multiply(mat1_roi, mat2_roi, dst_roi, s); cv::ocl::multiply(gmat1, gmat2, gdst, s); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 0.001, ""); + Near(.001); } } @@ -425,10 +397,7 @@ TEST_P(Div, Mat) cv::divide(mat1_roi, mat2_roi, dst_roi); cv::ocl::divide(gmat1, gmat2, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 1, ""); + Near(1); } } @@ -443,10 +412,7 @@ TEST_P(Div, Mat_Scalar) cv::divide(mat1_roi, mat2_roi, dst_roi, s); cv::ocl::divide(gmat1, gmat2, gdst, s); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 0.001, ""); + Near(.001); } } @@ -461,10 +427,7 @@ TEST_P(Absdiff, Mat) cv::absdiff(mat1_roi, mat2_roi, dst_roi); cv::ocl::absdiff(gmat1, gmat2, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 0, ""); + Near(0); } } @@ -476,10 +439,7 @@ TEST_P(Absdiff, Mat_Scalar) cv::absdiff(mat1_roi, val, dst_roi); cv::ocl::absdiff(gmat1, val, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } @@ -495,14 +455,8 @@ TEST_P(CartToPolar, angleInDegree) cv::cartToPolar(mat1_roi, mat2_roi, dst_roi, dst1_roi, 1); cv::ocl::cartToPolar(gmat1, gmat2, gdst, gdst1, 1); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - cv::Mat cpu_dst1; - gdst1_whole.download(cpu_dst1); - EXPECT_MAT_NEAR(dst, cpu_dst, 0.5, ""); - EXPECT_MAT_NEAR(dst1, cpu_dst1, 0.5, ""); + Near(.5); + Near1(.5); } } @@ -514,14 +468,8 @@ TEST_P(CartToPolar, angleInRadians) cv::cartToPolar(mat1_roi, mat2_roi, dst_roi, dst1_roi, 0); cv::ocl::cartToPolar(gmat1, gmat2, gdst, gdst1, 0); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - cv::Mat cpu_dst1; - gdst1_whole.download(cpu_dst1); - EXPECT_MAT_NEAR(dst, cpu_dst, 0.5, ""); - EXPECT_MAT_NEAR(dst1, cpu_dst1, 0.5, ""); + Near(.5); + Near1(.5); } } @@ -536,15 +484,8 @@ TEST_P(PolarToCart, angleInDegree) cv::polarToCart(mat1_roi, mat2_roi, dst_roi, dst1_roi, 1); cv::ocl::polarToCart(gmat1, gmat2, gdst, gdst1, 1); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - cv::Mat cpu_dst1; - gdst1_whole.download(cpu_dst1); - - EXPECT_MAT_NEAR(dst, cpu_dst, 0.5, ""); - EXPECT_MAT_NEAR(dst1, cpu_dst1, 0.5, ""); + Near(.5); + Near1(.5); } } @@ -556,15 +497,8 @@ TEST_P(PolarToCart, angleInRadians) cv::polarToCart(mat1_roi, mat2_roi, dst_roi, dst1_roi, 0); cv::ocl::polarToCart(gmat1, gmat2, gdst, gdst1, 0); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - cv::Mat cpu_dst1; - gdst1_whole.download(cpu_dst1); - - EXPECT_MAT_NEAR(dst, cpu_dst, 0.5, ""); - EXPECT_MAT_NEAR(dst1, cpu_dst1, 0.5, ""); + Near(.5); + Near1(.5); } } @@ -581,11 +515,7 @@ TEST_P(Magnitude, Mat) cv::magnitude(mat1_roi, mat2_roi, dst_roi); cv::ocl::magnitude(gmat1, gmat2, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } @@ -600,16 +530,11 @@ TEST_P(Transpose, Mat) cv::transpose(mat1_roi, dst_roi); cv::ocl::transpose(gmat1, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } - struct Flip : ArithmTestBase {}; TEST_P(Flip, X) @@ -620,11 +545,7 @@ TEST_P(Flip, X) cv::flip(mat1_roi, dst_roi, 0); cv::ocl::flip(gmat1, gdst, 0); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } @@ -636,11 +557,7 @@ TEST_P(Flip, Y) cv::flip(mat1_roi, dst_roi, 1); cv::ocl::flip(gmat1, gdst, 1); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } @@ -652,11 +569,7 @@ TEST_P(Flip, BOTH) cv::flip(mat1_roi, dst_roi, -1); cv::ocl::flip(gmat1, gdst, -1); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } @@ -1016,11 +929,7 @@ TEST_P(Phase, Mat) random_roi(); cv::phase(mat1_roi, mat2_roi, dst_roi, angelInDegrees ? true : false); cv::ocl::phase(gmat1, gmat2, gdst, angelInDegrees ? true : false); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-2, ""); + Near(1e-2); } } } @@ -1037,11 +946,7 @@ TEST_P(Bitwise_and, Mat) cv::bitwise_and(mat1_roi, mat2_roi, dst_roi); cv::ocl::bitwise_and(gmat1, gmat2, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 0.0, ""); + Near(0); } } @@ -1053,13 +958,10 @@ TEST_P(Bitwise_and, Mat_Mask) cv::bitwise_and(mat1_roi, mat2_roi, dst_roi, mask_roi); cv::ocl::bitwise_and(gmat1, gmat2, gdst, gmask); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 0.0, ""); + Near(0); } } + TEST_P(Bitwise_and, Scalar) { for(int j = 0; j < LOOP_TIMES; j++) @@ -1068,12 +970,7 @@ TEST_P(Bitwise_and, Scalar) cv::bitwise_and(mat1_roi, val, dst_roi); cv::ocl::bitwise_and(gmat1, val, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); - + Near(1e-5); } } @@ -1085,11 +982,7 @@ TEST_P(Bitwise_and, Scalar_Mask) cv::bitwise_and(mat1_roi, val, dst_roi, mask_roi); cv::ocl::bitwise_and(gmat1, val, gdst, gmask); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } @@ -1107,11 +1000,7 @@ TEST_P(Bitwise_or, Mat) cv::bitwise_or(mat1_roi, mat2_roi, dst_roi); cv::ocl::bitwise_or(gmat1, gmat2, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 0.0, ""); + Near(0); } } @@ -1123,13 +1012,10 @@ TEST_P(Bitwise_or, Mat_Mask) cv::bitwise_or(mat1_roi, mat2_roi, dst_roi, mask_roi); cv::ocl::bitwise_or(gmat1, gmat2, gdst, gmask); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 0.0, ""); + Near(0); } } + TEST_P(Bitwise_or, Scalar) { for(int j = 0; j < LOOP_TIMES; j++) @@ -1138,11 +1024,7 @@ TEST_P(Bitwise_or, Scalar) cv::bitwise_or(mat1_roi, val, dst_roi); cv::ocl::bitwise_or(gmat1, val, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } @@ -1154,11 +1036,7 @@ TEST_P(Bitwise_or, Scalar_Mask) cv::bitwise_or(mat1_roi, val, dst_roi, mask_roi); cv::ocl::bitwise_or(gmat1, val, gdst, gmask); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } @@ -1176,11 +1054,7 @@ TEST_P(Bitwise_xor, Mat) cv::bitwise_xor(mat1_roi, mat2_roi, dst_roi); cv::ocl::bitwise_xor(gmat1, gmat2, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 0.0, ""); + Near(0); } } @@ -1192,13 +1066,10 @@ TEST_P(Bitwise_xor, Mat_Mask) cv::bitwise_xor(mat1_roi, mat2_roi, dst_roi, mask_roi); cv::ocl::bitwise_xor(gmat1, gmat2, gdst, gmask); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 0.0, ""); + Near(0); } } + TEST_P(Bitwise_xor, Scalar) { for(int j = 0; j < LOOP_TIMES; j++) @@ -1207,11 +1078,7 @@ TEST_P(Bitwise_xor, Scalar) cv::bitwise_xor(mat1_roi, val, dst_roi); cv::ocl::bitwise_xor(gmat1, val, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } @@ -1223,11 +1090,7 @@ TEST_P(Bitwise_xor, Scalar_Mask) cv::bitwise_xor(mat1_roi, val, dst_roi, mask_roi); cv::ocl::bitwise_xor(gmat1, val, gdst, gmask); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } @@ -1244,11 +1107,7 @@ TEST_P(Bitwise_not, Mat) cv::bitwise_not(mat1_roi, dst_roi); cv::ocl::bitwise_not(gmat1, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 0.0, ""); + Near(0); } } @@ -1277,11 +1136,7 @@ TEST_P(Compare, Mat) cv::compare(mat1_roi, mat2_roi, dst_roi, cmp_codes[i]); cv::ocl::compare(gmat1, gmat2, gdst, cmp_codes[i]); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 0.0, ""); + Near(0); } } @@ -1303,11 +1158,7 @@ TEST_P(Pow, Mat) double p = 4.5; cv::pow(mat1_roi, p, dst_roi); cv::ocl::pow(gmat1, p, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 1, ""); + Near(1); } } @@ -1344,7 +1195,7 @@ TEST_P(MagnitudeSqr, Mat) cv::Mat cpu_dst; cldst.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, 1, ""); + EXPECT_MAT_NEAR(dst, cpu_dst, 1); } } @@ -1365,18 +1216,13 @@ TEST_P(AddWeighted, Mat) cv::ocl::addWeighted(gmat1, alpha, gmat2, beta, gama, gdst); - - cv::Mat cpu_dst; - gdst_whole.download(cpu_dst); - - EXPECT_MAT_NEAR(dst, cpu_dst, 1e-5, ""); + Near(1e-5); } } - //********test**************** INSTANTIATE_TEST_CASE_P(Arithm, Lut, Combine( diff --git a/modules/ocl/test/test_blend.cpp b/modules/ocl/test/test_blend.cpp index 7e58303723..292353be60 100644 --- a/modules/ocl/test/test_blend.cpp +++ b/modules/ocl/test/test_blend.cpp @@ -109,7 +109,7 @@ TEST_P(Blend, Accuracy) else blendLinearGold(img1, img2, weights1, weights2, result_gold); - EXPECT_MAT_NEAR(result_gold, result, CV_MAT_DEPTH(type) == CV_8U ? 1.f : 1e-5f, 0); + EXPECT_MAT_NEAR(result_gold, result, CV_MAT_DEPTH(type) == CV_8U ? 1.f : 1e-5f); } INSTANTIATE_TEST_CASE_P(GPU_ImgProc, Blend, Combine( diff --git a/modules/ocl/test/test_calib3d.cpp b/modules/ocl/test/test_calib3d.cpp index 179829e0e6..4c635682c9 100644 --- a/modules/ocl/test/test_calib3d.cpp +++ b/modules/ocl/test/test_calib3d.cpp @@ -129,7 +129,7 @@ TEST_P(StereoMatchBP, Regression) bp(d_left, d_right, d_disp); d_disp.download(disp); disp.convertTo(disp, disp_gold.depth()); - EXPECT_MAT_NEAR(disp_gold, disp, 0.0, ""); + EXPECT_MAT_NEAR(disp_gold, disp, 0.0); } INSTANTIATE_TEST_CASE_P(OCL_Calib3D, StereoMatchBP, testing::Combine(testing::Values(64), testing::Values(8),testing::Values(2),testing::Values(25.0f), diff --git a/modules/ocl/test/test_color.cpp b/modules/ocl/test/test_color.cpp index 202967b7a6..9748104de6 100644 --- a/modules/ocl/test/test_color.cpp +++ b/modules/ocl/test/test_color.cpp @@ -100,7 +100,7 @@ PARAM_TEST_CASE(CvtColor, cv::Size, MatDepth) cv::cvtColor(src, dst_gold, CVTCODE(name));\ cv::Mat dst_mat;\ dst.download(dst_mat);\ - EXPECT_MAT_NEAR(dst_gold, dst_mat, 1e-5, "");\ + EXPECT_MAT_NEAR(dst_gold, dst_mat, 1e-5);\ } //add new ones here using macro @@ -141,7 +141,7 @@ TEST_P(CvtColor_Gray2RGB, Accuracy) cv::cvtColor(src, dst_gold, code); cv::Mat dst_mat; dst.download(dst_mat); - EXPECT_MAT_NEAR(dst_gold, dst_mat, 1e-5, ""); + EXPECT_MAT_NEAR(dst_gold, dst_mat, 1e-5); } @@ -171,7 +171,7 @@ TEST_P(CvtColor_YUV420, Accuracy) cv::Mat dst_mat; dst.download(dst_mat); MAT_DIFF(dst_mat, dst_gold); - EXPECT_MAT_NEAR(dst_gold, dst_mat, 1e-5, ""); + EXPECT_MAT_NEAR(dst_gold, dst_mat, 1e-5); } INSTANTIATE_TEST_CASE_P(OCL_ImgProc, CvtColor, testing::Combine( diff --git a/modules/ocl/test/test_filters.cpp b/modules/ocl/test/test_filters.cpp index cf36360a56..316076cc35 100644 --- a/modules/ocl/test/test_filters.cpp +++ b/modules/ocl/test/test_filters.cpp @@ -127,7 +127,7 @@ PARAM_TEST_CASE(FilterTestBase, { cv::Mat cpu_dst; gdst_whole.download(cpu_dst); - EXPECT_MAT_NEAR(dst, cpu_dst, threshold, ""); + EXPECT_MAT_NEAR(dst, cpu_dst, threshold); } }; diff --git a/modules/ocl/test/test_hog.cpp b/modules/ocl/test/test_hog.cpp index 02cfe65b8a..c95c25fe95 100644 --- a/modules/ocl/test/test_hog.cpp +++ b/modules/ocl/test/test_hog.cpp @@ -240,8 +240,7 @@ TEST_P(HOG, Detect) } } - char s[100] = {0}; - EXPECT_MAT_NEAR(cv::Mat(d_comp), cv::Mat(comp), 3, s); + EXPECT_MAT_NEAR(cv::Mat(d_comp), cv::Mat(comp), 3); } diff --git a/modules/ocl/test/test_imgproc.cpp b/modules/ocl/test/test_imgproc.cpp index 29e246adc2..664f8a3919 100644 --- a/modules/ocl/test/test_imgproc.cpp +++ b/modules/ocl/test/test_imgproc.cpp @@ -442,6 +442,13 @@ PARAM_TEST_CASE(ImgprocTestBase, MatType, MatType, MatType, MatType, MatType, bo clmask_roi = clmask(Rect(maskx, masky, roicols, roirows)); } } + + void Near(double threshold) + { + cv::Mat cpu_cldst; + cldst.download(cpu_cldst); + EXPECT_MAT_NEAR(dst, cpu_cldst, threshold); + } }; ////////////////////////////////equalizeHist////////////////////////////////////////// @@ -461,11 +468,7 @@ TEST_P(equalizeHist, Mat) random_roi(); cv::equalizeHist(mat1_roi, dst_roi); cv::ocl::equalizeHist(clmat1_roi, cldst_roi); - cv::Mat cpu_cldst; - cldst.download(cpu_cldst); - char sss[1024]; - sprintf(sss, "roicols=%d,roirows=%d,src1x=%d,src1y=%d,dstx=%d,dsty=%d,dst1x=%d,dst1y=%d,maskx=%d,masky=%d,src2x=%d,src2y=%d", roicols, roirows, src1x, src1y, dstx, dsty, dst1x, dst1y, maskx, masky, src2x, src2y); - EXPECT_MAT_NEAR(dst, cpu_cldst, 1.1, sss); + Near(1.1); } } } @@ -485,7 +488,7 @@ TEST_P(bilateralFilter, Mat) int d = 2 * radius + 1; double sigmaspace = 20.0; int bordertype[] = {cv::BORDER_CONSTANT, cv::BORDER_REPLICATE, cv::BORDER_REFLECT, cv::BORDER_WRAP, cv::BORDER_REFLECT_101}; - const char *borderstr[] = {"BORDER_CONSTANT", "BORDER_REPLICATE", "BORDER_REFLECT", "BORDER_WRAP", "BORDER_REFLECT_101"}; + //const char *borderstr[] = {"BORDER_CONSTANT", "BORDER_REPLICATE", "BORDER_REFLECT", "BORDER_WRAP", "BORDER_REFLECT_101"}; if (mat1.depth() != CV_8U || mat1.type() != dst.type()) { @@ -514,25 +517,7 @@ TEST_P(bilateralFilter, Mat) cv::bilateralFilter(mat1_roi, dst_roi, d, sigmacolor, sigmaspace, bordertype[i] | cv::BORDER_ISOLATED); cv::ocl::bilateralFilter(clmat1_roi, cldst_roi, d, sigmacolor, sigmaspace, bordertype[i] | cv::BORDER_ISOLATED); - - cv::Mat cpu_cldst; - cldst.download(cpu_cldst); - - - char sss[1024]; - sprintf(sss, "roicols=%d,roirows=%d,src1x=%d,src1y=%d,dstx=%d,dsty=%d,radius=%d,boredertype=%s", roicols, roirows, src1x, src1y, dstx, dsty, radius, borderstr[i]); - //for(int i=0;i(i,j)!=cpu_cldst.at(i,j)) - // cout<< i <<" "<< j <<" "<< (int)dst.at(i,j)<<" "<< (int)cpu_cldst.at(i,j)<<" "; - // } - // cout<get_rng(); int top = rng.uniform(0, 10); int bottom = rng.uniform(0, 10); @@ -584,24 +569,12 @@ TEST_P(CopyMakeBorder, Mat) cv::Mat cpu_cldst; #ifndef RANDOMROI cldst_roi.download(cpu_cldst); + EXPECT_MAT_NEAR(dst_roi, cpu_cldst, 0.0); #else cldst.download(cpu_cldst); + EXPECT_MAT_NEAR(dst, cpu_cldst, 0.0); #endif - char sss[1024]; - sprintf(sss, "roicols=%d,roirows=%d,src1x=%d,src1y=%d,dstx=%d,dsty=%d,dst1x=%d,dst1y=%d,top=%d,bottom=%d,left=%d,right=%d, bordertype=%s", roicols, roirows, src1x, src1y, dstx, dsty, dst1x, dst1y, top, bottom, left, right, borderstr[i]); -#ifndef RANDOMROI - EXPECT_MAT_NEAR(dst_roi, cpu_cldst, 0.0, sss); -#else - //for(int i=0;i(i,j)<<" "; - //} - //cout<