Fix OpenCL build warnings

2013-01-25 14:31:34 +04:00
parent b445f4b01d
commit 9509dfd1de
31 changed files with 963 additions and 949 deletions
--- a/modules/ocl/test/test_blend.cpp
+++ b/modules/ocl/test/test_blend.cpp
@@ -74,7 +74,7 @@ TEST_P(Blend, Accuracy)
    else
        blendLinearGold<float>(img1, img2, weights1, weights2, result_gold);

-    EXPECT_MAT_NEAR(result_gold, result, CV_MAT_DEPTH(type) == CV_8U ? 1 : 1e-5f, NULL)
+    EXPECT_MAT_NEAR(result_gold, result, CV_MAT_DEPTH(type) == CV_8U ? 1.f : 1e-5f, 0);
 }

 INSTANTIATE_TEST_CASE_P(GPU_ImgProc, Blend, Combine(