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

fixed #832

Browse Source
This commit is contained in:
Maria Dimashova 2011-04-29 14:37:02 +00:00
parent 2806db93d8
commit 34a18f79e1
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/features2d/include/opencv2/features2d/features2d.hpp
View File

@ -1630,7 +1630,7 @@ protected:
* Remove keypoints within borderPixels of an image edge. * Remove keypoints within borderPixels of an image edge.
*/ */
static void removeBorderKeypoints( vector<KeyPoint>& keypoints, static void removeBorderKeypoints( vector<KeyPoint>& keypoints,
Size imageSize, float borderSize ); Size imageSize, int borderSize );
}; };
/* /*

25
modules/features2d/src/descriptors.cpp
View File

@ -54,19 +54,15 @@ namespace cv
*/ */
struct RoiPredicate struct RoiPredicate
{ {
RoiPredicate( float _minX, float _minY, float _maxX, float _maxY ) RoiPredicate( const Rect& _r ) : r(_r)
: minX(_minX), minY(_minY), maxX(_maxX), maxY(_maxY)
{} {}
bool operator()( const KeyPoint& keyPt ) const bool operator()( const KeyPoint& keyPt ) const
{ {
Point2f pt = keyPt.pt; return !r.contains( keyPt.pt );
float eps = std::numeric_limits<float>::epsilon();
return (pt.x < minX + eps) || (pt.x >= maxX - eps) ||
(pt.y < minY + eps) || (pt.y >= maxY - eps);
} }
float minX, minY, maxX, maxY; Rect r;
}; };
DescriptorExtractor::~DescriptorExtractor() DescriptorExtractor::~DescriptorExtractor()
@ -74,14 +70,14 @@ DescriptorExtractor::~DescriptorExtractor()
void DescriptorExtractor::compute( const Mat& image, vector<KeyPoint>& keypoints, Mat& descriptors ) const void DescriptorExtractor::compute( const Mat& image, vector<KeyPoint>& keypoints, Mat& descriptors ) const
{ {
if( image.empty() || keypoints.empty() ) if( image.empty() || keypoints.empty() )
return; return;
// Check keypoints are in image. Do filter bad points here? // Check keypoints are in image. Do filter bad points here?
//for( size_t i = 0; i < keypoints.size(); i++ ) //for( size_t i = 0; i < keypoints.size(); i++ )
// CV_Assert( Rect(0,0, image.cols, image.rows).contains(keypoints[i].pt) ); // CV_Assert( Rect(0,0, image.cols, image.rows).contains(keypoints[i].pt) );
computeImpl( image, keypoints, descriptors ); computeImpl( image, keypoints, descriptors );
} }
void DescriptorExtractor::compute( const vector<Mat>& imageCollection, vector<vector<KeyPoint> >& pointCollection, vector<Mat>& descCollection ) const void DescriptorExtractor::compute( const vector<Mat>& imageCollection, vector<vector<KeyPoint> >& pointCollection, vector<Mat>& descCollection ) const
@ -104,14 +100,13 @@ bool DescriptorExtractor::empty() const
} }
void DescriptorExtractor::removeBorderKeypoints( vector<KeyPoint>& keypoints, void DescriptorExtractor::removeBorderKeypoints( vector<KeyPoint>& keypoints,
Size imageSize, float borderSize ) Size imageSize, int borderSize )
{ {
if( borderSize > 0) if( borderSize > 0)
{ {
keypoints.erase( remove_if(keypoints.begin(), keypoints.end(), keypoints.erase( remove_if(keypoints.begin(), keypoints.end(),
RoiPredicate(borderSize, borderSize, RoiPredicate(Rect(Point(borderSize, borderSize),
(float)imageSize.width - borderSize, Point(imageSize.width - borderSize, imageSize.height - borderSize)))),
(float)imageSize.height - borderSize)),
keypoints.end() ); keypoints.end() );
} }
} }