propagated some more fixes from 2.3 branch to the trunk

This commit is contained in:
Vadim Pisarevsky
2011-06-29 22:06:42 +00:00
parent dacd265424
commit b204e73d9a
54 changed files with 9120 additions and 3049 deletions

View File

@@ -398,6 +398,8 @@ private:
//switch (sz)
{
//default:
if( rotated_patterns_.empty() )
rotated_patterns_ = OrbPatterns::generateRotatedPatterns();
pattern_data = reinterpret_cast<int*> (rotated_patterns_[angle_idx].data);
//break;
}
@@ -437,7 +439,7 @@ private:
};
std::vector<cv::Mat> ORB::OrbPatterns::rotated_patterns_ = OrbPatterns::generateRotatedPatterns();
std::vector<cv::Mat> ORB::OrbPatterns::rotated_patterns_;
//this is the definition for BIT_PATTERN
#include "orb_pattern.hpp"