fix warnings, unify test names

This commit is contained in:
yao
2013-05-09 17:57:13 +08:00
parent b6313951dc
commit ada8f92cc7
11 changed files with 34 additions and 110 deletions

View File

@@ -83,15 +83,11 @@ TEST_P(PyrDown, Mat)
cv::pyrDown(src, dst_cpu);
cv::ocl::pyrDown(gsrc, gdst);
cv::Mat dst;
gdst.download(dst);
char s[1024] = {0};
EXPECT_MAT_NEAR(dst, dst_cpu, dst.depth() == CV_32F ? 1e-4f : 1.0f, s);
EXPECT_MAT_NEAR(dst_cpu, Mat(gdst), type == CV_32F ? 1e-4f : 1.0f);
}
}
INSTANTIATE_TEST_CASE_P(GPU_ImgProc, PyrDown, Combine(
INSTANTIATE_TEST_CASE_P(OCL_ImgProc, PyrDown, Combine(
Values(CV_8U, CV_32F), Values(1, 3, 4)));