From: Vincent Rabaud <no@email>
Date: Mon, 23 May 2011 20:03:16 +0000 (+0000)
Subject: - fix possible crash introduced by cvRound
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~7274
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=974799acd869d229ca2f9aad014a06083c68b77b;p=platform%2Fupstream%2Fopencv.git

- fix possible crash introduced by cvRound
---

diff --git a/modules/features2d/src/orb.cpp b/modules/features2d/src/orb.cpp
index a25ae7d..8cf752c 100644
--- a/modules/features2d/src/orb.cpp
+++ b/modules/features2d/src/orb.cpp
@@ -388,7 +388,8 @@ public:
 private:
   static inline int angle2Wedge(float angle)
   {
-    return cvRound((angle / 360) * kNumAngles);
+    static float scale = float(kNumAngles) / 360.0f;
+    return std::min(int(std::floor(angle * scale)), kNumAngles - 1);
   }
 
   void generateRelativePattern(int angle_idx, int /*sz*/, cv::Mat & relative_pattern)