generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added NORM_L2SQR type to cv::norm

Browse Source
This commit is contained in:
Ilya Lavrenov
2014-01-07 20:32:22 +04:00
parent 2e5e278271
commit da2790249e
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/core/test/ocl/test_arithm.cpp
View File

@@ -1011,7 +1011,6 @@ OCL_TEST_P(Phase, angleInDegree)
}
}
OCL_TEST_P(Phase, angleInRadians)
{
for (int j = 0; j < test_loop_times; j++)
@@ -1548,6 +1547,25 @@ OCL_TEST_P(PatchNaNs, Mat)
}
}
//////////////////////////////// Psnr ////////////////////////////////////////////////
typedef ArithmTestBase Psnr;
OCL_TEST_P(Psnr, Mat)
{
for (int j = 0; j < test_loop_times; j++)
{
generateTestData();
double cpuRes = 0, gpuRes = 0;
OCL_OFF(cpuRes = cv::PSNR(src1_roi, src2_roi));
OCL_ON(gpuRes = cv::PSNR(usrc1_roi, usrc2_roi));
EXPECT_PRED3(relativeError, cpuRes, gpuRes, 1e-6);
}
}
//////////////////////////////////////// Instantiation /////////////////////////////////////////
OCL_INSTANTIATE_TEST_CASE_P(Arithm, Lut, Combine(::testing::Values(CV_8U, CV_8S), OCL_ALL_DEPTHS, OCL_ALL_CHANNELS, Bool(), Bool()));
@@ -1587,6 +1605,7 @@ OCL_INSTANTIATE_TEST_CASE_P(Arithm, InRange, Combine(OCL_ALL_DEPTHS, OCL_ALL_CHA
OCL_INSTANTIATE_TEST_CASE_P(Arithm, ConvertScaleAbs, Combine(OCL_ALL_DEPTHS, OCL_ALL_CHANNELS, Bool()));
OCL_INSTANTIATE_TEST_CASE_P(Arithm, ScaleAdd, Combine(OCL_ALL_DEPTHS, OCL_ALL_CHANNELS, Bool()));
OCL_INSTANTIATE_TEST_CASE_P(Arithm, PatchNaNs, Combine(OCL_ALL_CHANNELS, Bool()));
OCL_INSTANTIATE_TEST_CASE_P(Arithm, Psnr, Combine(::testing::Values((MatDepth)CV_8U), OCL_ALL_CHANNELS, Bool()));
} } // namespace cvtest::ocl