From 73f760fdf09115009097725a213461c8016c845d Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Tue, 5 May 2015 18:03:40 +0300 Subject: [PATCH] some more compile warnings fixed --- modules/core/src/mathfuncs.cpp | 1 + modules/core/test/test_math.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/core/src/mathfuncs.cpp b/modules/core/src/mathfuncs.cpp index 2284074..b8e4b1a 100644 --- a/modules/core/src/mathfuncs.cpp +++ b/modules/core/src/mathfuncs.cpp @@ -43,6 +43,7 @@ #include "precomp.hpp" #include "opencl_kernels_core.hpp" +#include namespace cv { diff --git a/modules/core/test/test_math.cpp b/modules/core/test/test_math.cpp index 23a1452..e440519 100644 --- a/modules/core/test/test_math.cpp +++ b/modules/core/test/test_math.cpp @@ -2857,14 +2857,15 @@ TEST(Core_Pow, special) r0 = std::pow(val, power); if( cvIsInf(r0) ) { - ASSERT_TRUE(cvIsInf(r)); + ASSERT_TRUE(cvIsInf(r) != 0); } else if( cvIsNaN(r0) ) { - ASSERT_TRUE(cvIsNaN(r)); + ASSERT_TRUE(cvIsNaN(r) != 0); } else { + ASSERT_TRUE(cvIsInf(r) == 0 && cvIsNaN(r) == 0); ASSERT_LT(fabs(r - r0), eps); } } -- 2.7.4