norm -> cvtest::norm

modules/photo/test/test_cloning.cpp

@@ -112,7 +112,7 @@ TEST(Photo_SeamlessClone_mixed, regression)
     SAVE(result);
 
     Mat reference = imread(folder + "reference.png");
-    double error = norm(reference, result, NORM_L1);
+    double error = cvtest::norm(reference, result, NORM_L1);
     EXPECT_LE(error, numerical_precision);
 
 }
@@ -141,7 +141,7 @@ TEST(Photo_SeamlessClone_featureExchange, regression)
     SAVE(result);
 
     Mat reference = imread(folder + "reference.png");
-    double error = norm(reference, result, NORM_L1);
+    double error = cvtest::norm(reference, result, NORM_L1);
     EXPECT_LE(error, numerical_precision);
 
 }
@@ -164,7 +164,7 @@ TEST(Photo_SeamlessClone_colorChange, regression)
     SAVE(result);
 
     Mat reference = imread(folder + "reference.png");
-    double error = norm(reference, result, NORM_L1);
+    double error = cvtest::norm(reference, result, NORM_L1);
     EXPECT_LE(error, numerical_precision);
 
 }
@@ -187,7 +187,7 @@ TEST(Photo_SeamlessClone_illuminationChange, regression)
     SAVE(result);
 
     Mat reference = imread(folder + "reference.png");
-    double error = norm(reference, result, NORM_L1);
+    double error = cvtest::norm(reference, result, NORM_L1);
     EXPECT_LE(error, numerical_precision);
 
 }
@@ -210,7 +210,7 @@ TEST(Photo_SeamlessClone_textureFlattening, regression)
     SAVE(result);
 
     Mat reference = imread(folder + "reference.png");
-    double error = norm(reference, result, NORM_L1);
+    double error = cvtest::norm(reference, result, NORM_L1);
     EXPECT_LE(error, numerical_precision);
 
 }

modules/photo/test/test_decolor.cpp

@@ -63,10 +63,10 @@ TEST(Photo_Decolor, regression)
         decolor(original, grayscale, color_boost);
 
         Mat reference_grayscale = imread(folder + "grayscale_reference.png", 0 /* == grayscale image*/);
-        double error_grayscale = norm(reference_grayscale, grayscale, NORM_L1);
+        double error_grayscale = cvtest::norm(reference_grayscale, grayscale, NORM_L1);
         EXPECT_LE(error_grayscale, numerical_precision);
 
         Mat reference_boost = imread(folder + "boost_reference.png");
-        double error_boost = norm(reference_boost, color_boost, NORM_L1);
+        double error_boost = cvtest::norm(reference_boost, color_boost, NORM_L1);
         EXPECT_LE(error_boost, numerical_precision);
 }

modules/photo/test/test_npr.cpp

@@ -62,7 +62,7 @@ TEST(Photo_NPR_EdgePreserveSmoothing_RecursiveFilter, regression)
     edgePreservingFilter(source,result,1);
 
     Mat reference = imread(folder + "smoothened_RF_reference.png");
-    double error = norm(reference, result, NORM_L1);
+    double error = cvtest::norm(reference, result, NORM_L1);
     EXPECT_LE(error, numerical_precision);
 }
 
@@ -79,7 +79,7 @@ TEST(Photo_NPR_EdgePreserveSmoothing_NormConvFilter, regression)
     edgePreservingFilter(source,result,2);
 
     Mat reference = imread(folder + "smoothened_NCF_reference.png");
-    double error = norm(reference, result, NORM_L1);
+    double error = cvtest::norm(reference, result, NORM_L1);
     EXPECT_LE(error, numerical_precision);
 
 }
@@ -97,7 +97,7 @@ TEST(Photo_NPR_DetailEnhance, regression)
     detailEnhance(source,result);
 
     Mat reference = imread(folder + "detail_enhanced_reference.png");
-    double error = norm(reference, result, NORM_L1);
+    double error = cvtest::norm(reference, result, NORM_L1);
     EXPECT_LE(error, numerical_precision);
 }
 
@@ -118,7 +118,7 @@ TEST(Photo_NPR_PencilSketch, regression)
     EXPECT_LE(pencil_error, numerical_precision);
 
     Mat color_pencil_reference = imread(folder + "color_pencil_sketch_reference.png");
-    double color_pencil_error = norm(color_pencil_reference, color_pencil_result, NORM_L1);
+    double color_pencil_error = cvtest::norm(color_pencil_reference, color_pencil_result, NORM_L1);
     EXPECT_LE(color_pencil_error, numerical_precision);
 }
 
@@ -135,7 +135,7 @@ TEST(Photo_NPR_Stylization, regression)
     stylization(source,result);
 
     Mat stylized_reference = imread(folder + "stylized_reference.png");
-    double stylized_error = norm(stylized_reference, result, NORM_L1);
+    double stylized_error = cvtest::norm(stylized_reference, result, NORM_L1);
     EXPECT_LE(stylized_error, numerical_precision);
 
 }