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

Fixed sanity check for integer type

Browse Source
This commit is contained in:
Alexander Karsakov
2014-04-17 19:02:56 +04:00
parent a7d12aabab
commit 6202f54a18
2 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/imgproc/perf/perf_pyramids.cpp
View File

@@ -15,6 +15,7 @@ PERF_TEST_P(Size_MatType, pyrDown, testing::Combine(
Size sz = get<0>(GetParam());
int matType = get<1>(GetParam());
const double eps = CV_MAT_DEPTH(matType) <= CV_32S ? 1 : 1e-5;
perf::ERROR_TYPE error_type = CV_MAT_DEPTH(matType) <= CV_32S ? ERROR_ABSOLUTE : ERROR_RELATIVE;
Mat src(sz, matType);
Mat dst((sz.height + 1)/2, (sz.width + 1)/2, matType);
@@ -23,7 +24,7 @@ PERF_TEST_P(Size_MatType, pyrDown, testing::Combine(
TEST_CYCLE() pyrDown(src, dst);
SANITY_CHECK(dst, eps, ERROR_RELATIVE);
SANITY_CHECK(dst, eps, error_type);
}
PERF_TEST_P(Size_MatType, pyrUp, testing::Combine(
@@ -35,6 +36,7 @@ PERF_TEST_P(Size_MatType, pyrUp, testing::Combine(
Size sz = get<0>(GetParam());
int matType = get<1>(GetParam());
const double eps = CV_MAT_DEPTH(matType) <= CV_32S ? 1 : 1e-5;
perf::ERROR_TYPE error_type = CV_MAT_DEPTH(matType) <= CV_32S ? ERROR_ABSOLUTE : ERROR_RELATIVE;
Mat src(sz, matType);
Mat dst(sz.height*2, sz.width*2, matType);
@@ -43,12 +45,12 @@ PERF_TEST_P(Size_MatType, pyrUp, testing::Combine(
TEST_CYCLE() pyrUp(src, dst);
SANITY_CHECK(dst, eps, ERROR_RELATIVE);
SANITY_CHECK(dst, eps, error_type);
}
PERF_TEST_P(Size_MatType, buildPyramid, testing::Combine(
testing::Values(sz1080p, sz720p, szVGA, szQVGA, szODD),
testing::Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_16UC1, CV_16UC3, CV_16UC4, CV_32FC1, CV_32FC3, CV_32FC4)
testing::Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_32FC1, CV_32FC3, CV_32FC4)
)
)
{
@@ -56,7 +58,7 @@ PERF_TEST_P(Size_MatType, buildPyramid, testing::Combine(
int matType = get<1>(GetParam());
int maxLevel = 5;
const double eps = CV_MAT_DEPTH(matType) <= CV_32S ? 1 : 1e-5;
perf::ERROR_TYPE error_type = CV_MAT_DEPTH(matType) <= CV_32S ? ERROR_ABSOLUTE : ERROR_RELATIVE;
Mat src(sz, matType);
std::vector<Mat> dst(maxLevel);
@@ -66,9 +68,9 @@ PERF_TEST_P(Size_MatType, buildPyramid, testing::Combine(
Mat dst0 = dst[0], dst1 = dst[1], dst2 = dst[2], dst3 = dst[3], dst4 = dst[4];
SANITY_CHECK(dst0, eps, ERROR_RELATIVE);
SANITY_CHECK(dst1, eps, ERROR_RELATIVE);
SANITY_CHECK(dst2, eps, ERROR_RELATIVE);
SANITY_CHECK(dst3, eps, ERROR_RELATIVE);
SANITY_CHECK(dst4, eps, ERROR_RELATIVE);
SANITY_CHECK(dst0, eps, error_type);
SANITY_CHECK(dst1, eps, error_type);
SANITY_CHECK(dst2, eps, error_type);
SANITY_CHECK(dst3, eps, error_type);
SANITY_CHECK(dst4, eps, error_type);
}