some more compile warnings fixed

headupinclouds · May 5, 2015 · 73f760f · 73f760f
1 parent 931a519
commit 73f760f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
 {

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