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:
5e84ab0
)
fixed compile error on VS2008
author
Maria Dimashova
<no@email>
Fri, 30 Jul 2010 14:36:04 +0000
(14:36 +0000)
committer
Maria Dimashova
<no@email>
Fri, 30 Jul 2010 14:36:04 +0000
(14:36 +0000)
modules/features2d/src/keypoint.cpp
patch
|
blob
|
history
diff --git
a/modules/features2d/src/keypoint.cpp
b/modules/features2d/src/keypoint.cpp
index
9ce7311
..
6df98cb
100644
(file)
--- a/
modules/features2d/src/keypoint.cpp
+++ b/
modules/features2d/src/keypoint.cpp
@@
-143,7
+143,7
@@
float KeyPoint::overlap( const KeyPoint& kp1, const KeyPoint& kp2 )
float triangleAreaB = b_2 * sinAlpha * cosAlpha;
float intersectionArea = segmentAreaA + segmentAreaB - triangleAreaA - triangleAreaB;
- float unionArea = (a_2 + b_2) *
M
_PI - intersectionArea;
+ float unionArea = (a_2 + b_2) *
CV
_PI - intersectionArea;
ovrl = intersectionArea / unionArea;
}