generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- fix a bug if the descriptor is used for images of different size

Browse Source
This commit is contained in:
Vincent Rabaud 2011-06-24 23:21:39 +00:00
parent c1940b4ec7
commit 7c2e74b649
1 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/features2d/src/orb.cpp
View File

@ -381,24 +381,6 @@ public:
} }
} }
/** Compare the currently used normalized step of the integral image to a new one
* @param integral_image the integral we want to use the pattern on
* @return true if the two steps are equal
*/
bool compareNormalizedStep(const cv::Mat & integral_image) const
{
return (normalized_step_ == integral_image.step1());
}
/** Compare the currently used normalized step of the integral image to a new one
* @param step_size the normalized step size to compare to
* @return true if the two steps are equal
*/
bool compareNormalizedStep(unsigned int normalized_step_size) const
{
return (normalized_step_ == normalized_step_size);
}
private: private:
static inline int angle2Wedge(float angle) static inline int angle2Wedge(float angle)
{ {
@ -777,11 +759,11 @@ void ORB::computeIntegralImage(const cv::Mat & image, unsigned int level, cv::Ma
integral(image, integral_image, CV_32S); integral(image, integral_image, CV_32S);
integral_image_steps_.resize(params_.n_levels_, 0); integral_image_steps_.resize(params_.n_levels_, 0);
if (integral_image_steps_[level] == integral_image.step1()) unsigned int integral_image_step = integral_image.step1();
if (integral_image_steps_[level] == integral_image_step)
return; return;
// If the integral image dimensions have changed, recompute everything // If the integral image dimensions have changed, recompute everything
int integral_image_step = integral_image.step1();
// Cache the step sizes // Cache the step sizes
integral_image_steps_[level] = integral_image_step; integral_image_steps_[level] = integral_image_step;
@ -815,13 +797,10 @@ void ORB::computeIntegralImage(const cv::Mat & image, unsigned int level, cv::Ma
// Remove the previous version if dimensions are different // Remove the previous version if dimensions are different
patterns_.resize(params_.n_levels_, 0); patterns_.resize(params_.n_levels_, 0);
if ((patterns_[level]) && (patterns_[level]->compareNormalizedStep(integral_image))) if (patterns_[level])
{
delete patterns_[level]; delete patterns_[level];
patterns_[level] = 0;
} patterns_[level] = new OrbPatterns(params_.patch_size_, integral_image_step);
if (!patterns_[level])
patterns_[level] = new OrbPatterns(params_.patch_size_, integral_image.step1());
} }
/** Compute the ORB decriptors /** Compute the ORB decriptors