projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
723bc3c
)
Replaced isfinite() with cvIsInf and cvIsNan
author
Nghia Ho
<nghiaho12@yahoo.com>
Tue, 13 Aug 2013 11:26:21 +0000
(21:26 +1000)
committer
Nghia Ho
<nghiaho12@yahoo.com>
Tue, 13 Aug 2013 11:26:21 +0000
(21:26 +1000)
modules/imgproc/src/intersection.cpp
patch
|
blob
|
history
diff --git
a/modules/imgproc/src/intersection.cpp
b/modules/imgproc/src/intersection.cpp
index
6e409c1
..
d1b80b1
100644
(file)
--- 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;
}