Merged the trunk r8887, r8891, r8314

2012-07-02 12:33:37 +00:00
parent 5a7804d958
commit d4df1e0b5c
4 changed files with 15 additions and 8 deletions
--- a/modules/features2d/src/draw.cpp
+++ b/modules/features2d/src/draw.cpp
@@ -68,8 +68,8 @@ static inline void _drawKeypoint( Mat& img, const KeyPoint& p, const Scalar& col
        if( p.angle != -1 )
        {
            float srcAngleRad = p.angle*(float)CV_PI/180.f;
-            Point orient( cvRound( cos(srcAngleRad)*radius ),
-                          cvRound(-sin(srcAngleRad)*radius ) // "-" to invert orientation of axis y
+            Point orient( cvRound(cos(srcAngleRad)*radius ),
+                          cvRound(sin(srcAngleRad)*radius )
                        );
            line( img, center, center+orient, color, 1, CV_AA, draw_shift_bits );
        }