projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d01e95f
)
Update intersection.cpp
author
Nghia
<nghiaho12@yahoo.com>
Wed, 7 Aug 2013 04:57:12 +0000
(14:57 +1000)
committer
Nghia
<nghiaho12@yahoo.com>
Wed, 7 Aug 2013 04:57:12 +0000
(14:57 +1000)
Added #ifdef _WIN32 for finite number testing
modules/imgproc/src/intersection.cpp
patch
|
blob
|
history
diff --git
a/modules/imgproc/src/intersection.cpp
b/modules/imgproc/src/intersection.cpp
index
f63f823
..
817fc8a
100644
(file)
--- a/
modules/imgproc/src/intersection.cpp
+++ b/
modules/imgproc/src/intersection.cpp
@@
-121,7
+121,11
@@
int rotatedRectangleIntersection( const RotatedRect& rect1, const RotatedRect& r
float t2 = (vx1*y21 - vy1*x21) / det;
// This takes care of parallel lines
+#ifdef _WIN32
+ if( !_finite(t1) || ! _finite(t2) )
+#else
if( !std::isfinite(t1) || !std::isfinite(t2) )
+#endif
{
continue;
}