Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed sanity check for integer type

Browse Source
pull/2627/head
Alexander Karsakov 11 years ago
parent a7d12aabab
commit 6202f54a18
2 changed files with 11 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      modules/imgproc/perf/perf_pyramids.cpp
  2. 10
      modules/imgproc/src/pyramids.cpp

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

@ -15,6 +15,7 @@ PERF_TEST_P(Size_MatType, pyrDown, testing::Combine(
Size sz = get<0>(GetParam()); Size sz = get<0>(GetParam());
int matType = get<1>(GetParam()); int matType = get<1>(GetParam());
const double eps = CV_MAT_DEPTH(matType) <= CV_32S ? 1 : 1e-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); Mat src(sz, matType);
Mat dst((sz.height + 1)/2, (sz.width + 1)/2, 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); 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( 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()); Size sz = get<0>(GetParam());
int matType = get<1>(GetParam()); int matType = get<1>(GetParam());
const double eps = CV_MAT_DEPTH(matType) <= CV_32S ? 1 : 1e-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); Mat src(sz, matType);
Mat dst(sz.height*2, sz.width*2, 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); 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( PERF_TEST_P(Size_MatType, buildPyramid, testing::Combine(
testing::Values(sz1080p, sz720p, szVGA, szQVGA, szODD), 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 matType = get<1>(GetParam());
int maxLevel = 5; int maxLevel = 5;
const double eps = CV_MAT_DEPTH(matType) <= CV_32S ? 1 : 1e-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); Mat src(sz, matType);
std::vector<Mat> dst(maxLevel); 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]; Mat dst0 = dst[0], dst1 = dst[1], dst2 = dst[2], dst3 = dst[3], dst4 = dst[4];
SANITY_CHECK(dst0, eps, ERROR_RELATIVE); SANITY_CHECK(dst0, eps, error_type);
SANITY_CHECK(dst1, eps, ERROR_RELATIVE); SANITY_CHECK(dst1, eps, error_type);
SANITY_CHECK(dst2, eps, ERROR_RELATIVE); SANITY_CHECK(dst2, eps, error_type);
SANITY_CHECK(dst3, eps, ERROR_RELATIVE); SANITY_CHECK(dst3, eps, error_type);
SANITY_CHECK(dst4, eps, ERROR_RELATIVE); SANITY_CHECK(dst4, eps, error_type);
} }

10
modules/imgproc/src/pyramids.cpp
Unescape View File

@ -671,16 +671,6 @@ void cv::buildPyramid( InputArray _src, OutputArrayOfArrays _dst, int maxlevel,
pyrInitAllocFunc = (ippiPyramidLayerDownInitAlloc) ippiPyramidLayerDownInitAlloc_8u_C3R; pyrInitAllocFunc = (ippiPyramidLayerDownInitAlloc) ippiPyramidLayerDownInitAlloc_8u_C3R;
pyrDownFunc = (ippiPyramidLayerDown) ippiPyramidLayerDown_8u_C3R; pyrDownFunc = (ippiPyramidLayerDown) ippiPyramidLayerDown_8u_C3R;
pyrFreeFunc = (ippiPyramidLayerDownFree) ippiPyramidLayerDownFree_8u_C3R; pyrFreeFunc = (ippiPyramidLayerDownFree) ippiPyramidLayerDownFree_8u_C3R;
} else if (type == CV_16UC1)
{
pyrInitAllocFunc = (ippiPyramidLayerDownInitAlloc) ippiPyramidLayerDownInitAlloc_16u_C1R;
pyrDownFunc = (ippiPyramidLayerDown) ippiPyramidLayerDown_16u_C1R;
pyrFreeFunc = (ippiPyramidLayerDownFree) ippiPyramidLayerDownFree_16u_C1R;
} else if (type == CV_16UC3)
{
pyrInitAllocFunc = (ippiPyramidLayerDownInitAlloc) ippiPyramidLayerDownInitAlloc_16u_C3R;
pyrDownFunc = (ippiPyramidLayerDown) ippiPyramidLayerDown_16u_C3R;
pyrFreeFunc = (ippiPyramidLayerDownFree) ippiPyramidLayerDownFree_16u_C3R;
} else if (type == CV_32FC1) } else if (type == CV_32FC1)
{ {
pyrInitAllocFunc = (ippiPyramidLayerDownInitAlloc) ippiPyramidLayerDownInitAlloc_32f_C1R; pyrInitAllocFunc = (ippiPyramidLayerDownInitAlloc) ippiPyramidLayerDownInitAlloc_32f_C1R;

Write Preview
Loading…
Cancel
Save