Merge pull request #2658 from akarsakov:ipp_hough

2014-05-07 17:07:22 +04:00
parent d54aa307fd f6a8ac2f6c
commit 9e47672b2b
3 changed files with 202 additions and 80 deletions
--- a/modules/imgproc/perf/perf_houghLines.cpp
+++ b/modules/imgproc/perf/perf_houghLines.cpp
@@ -37,5 +37,9 @@ PERF_TEST_P(Image_RhoStep_ThetaStep_Threshold, HoughLines,
    TEST_CYCLE() HoughLines(image, lines, rhoStep, thetaStep, threshold);

    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
 }