some more compile warnings fixed

73f760fd · Vadim Pisarevsky · 931a5199 · 73f760fd · 73f760fd
Commit 73f760fd authored May 05, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

mathfuncs.cpp modules/core/src/mathfuncs.cpp +1 -0

test_math.cpp modules/core/test/test_math.cpp +3 -2

No files found.
--- 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 <limits>

 namespace cv
 {

--- 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);
            }
        }