generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some more compile warnings fixed

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-05-05 18:03:40 +03:00
parent 931a519969
commit 73f760fdf0
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/src/mathfuncs.cpp
View File

@@ -43,6 +43,7 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencl_kernels_core.hpp" #include "opencl_kernels_core.hpp"
#include <limits>
namespace cv namespace cv
{ {

5
modules/core/test/test_math.cpp
View File

@@ -2857,14 +2857,15 @@ TEST(Core_Pow, special)
r0 = std::pow(val, power); r0 = std::pow(val, power);
if( cvIsInf(r0) ) if( cvIsInf(r0) )
{ {
ASSERT_TRUE(cvIsInf(r)); ASSERT_TRUE(cvIsInf(r) != 0);
} }
else if( cvIsNaN(r0) ) else if( cvIsNaN(r0) )
{ {
ASSERT_TRUE(cvIsNaN(r)); ASSERT_TRUE(cvIsNaN(r) != 0);
} }
else else
{ {
ASSERT_TRUE(cvIsInf(r) == 0 && cvIsNaN(r) == 0);
ASSERT_LT(fabs(r - r0), eps); ASSERT_LT(fabs(r - r0), eps);
} }
} }