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/highgui/test/test_ffmpeg.cpp
+++ b/modules/highgui/test/test_ffmpeg.cpp
@@ -163,7 +163,7 @@ public:

            CV_Assert( !img0.empty() && !img.empty() && img_next.empty() );

-            double diff = norm(img0, img, CV_C);
+            double diff = cvtest::norm(img0, img, CV_C);
            CV_Assert( diff == 0 );
        }
        catch(...)