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

Changed check condition in tests in case ipp disabled.

Browse Source
This commit is contained in:
Alexander Karsakov 2014-05-06 14:24:49 +04:00
parent dc91be86b2
commit f6a8ac2f6c
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/imgproc/perf/perf_houghLines.cpp
View File

@ -15,8 +15,8 @@ PERF_TEST_P(Image_RhoStep_ThetaStep_Threshold, HoughLines,
testing::Combine(
testing::Values( "cv/shared/pic5.png", "stitching/a1.png" ),
testing::Values( 1, 10 ),
testing::Values( 0.05, 0.1 ),
testing::Values( 80 , 150 )
testing::Values( 0.01, 0.1 ),
testing::Values( 300, 500 )
)
)
{
@ -29,13 +29,17 @@ PERF_TEST_P(Image_RhoStep_ThetaStep_Threshold, HoughLines,
if (image.empty())
FAIL() << "Unable to load source image" << filename;
Canny(image, image, 100, 150, 3);
Canny(image, image, 0, 0);
Mat lines;
declare.time(60);
TEST_CYCLE() HoughLines(image, lines, rhoStep, thetaStep, threshold);
EXPECT_FALSE(lines.empty());
transpose(lines, lines);
#if (0 && defined(HAVE_IPP) && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 801)
SANITY_CHECK_NOTHING();
#else
SANITY_CHECK(lines);
#endif
}

4
modules/imgproc/test/test_houghLines.cpp
View File

@ -189,7 +189,11 @@ void BaseHoughLineTest::run_test(int type)
else if (type == PROBABILISTIC)
count = countMatIntersection<Vec4i>(exp_lines, lines, 1e-4f, 0.f);
#if (0 && defined(HAVE_IPP) && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 801)
EXPECT_GE( count, (int) (exp_lines.total() * 0.8) );
#else
EXPECT_EQ( count, (int) exp_lines.total());
#endif
}
TEST_P(StandartHoughLinesTest, regression)