From 79965c9ee9eade95623a028820c7c1a899919ba2 Mon Sep 17 00:00:00 2001 From: Nghia Ho Date: Tue, 13 Aug 2013 21:26:21 +1000 Subject: [PATCH] Replaced isfinite() with cvIsInf and cvIsNan --- modules/imgproc/src/intersection.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/imgproc/src/intersection.cpp b/modules/imgproc/src/intersection.cpp index 6e409c1..d1b80b1 100644 --- a/modules/imgproc/src/intersection.cpp +++ b/modules/imgproc/src/intersection.cpp @@ -121,12 +121,7 @@ int rotatedRectangleIntersection( const RotatedRect& rect1, const RotatedRect& r float t2 = (vx1*y21 - vy1*x21) / det; // This takes care of parallel lines - // MSVC does not have std::infinite? -#ifdef _WIN32 - if( !_finite(t1) || ! _finite(t2) ) -#else - if( !std::isfinite(t1) || !std::isfinite(t2) ) -#endif + if( cvIsInf(t1) || cvIsInf(t2) || cvIsNaN(t1) || cvIsNaN(t2) ) { continue; } -- 2.7.4