cv::norm -> cvtest::norm in tests

Conflicts: modules/core/src/stat.cpp
2014-04-08 01:11:58 +04:00
parent a6ef45aa13
commit aa5326c231
37 changed files with 158 additions and 142 deletions
--- a/modules/imgproc/test/test_houghLines.cpp
+++ b/modules/imgproc/test/test_houghLines.cpp
@@ -137,7 +137,7 @@ void CV_HoughLinesTest::run_test(int type)
    if( exp_lines.size != lines.size )
        transpose(lines, lines);

-    if ( exp_lines.size != lines.size || norm(exp_lines, lines, NORM_INF) > 1e-4 )
+    if ( exp_lines.size != lines.size || cvtest::norm(exp_lines, lines, NORM_INF) > 1e-4 )
    {
        ts->set_failed_test_info(cvtest::TS::FAIL_MISMATCH);
        return;