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

fixed MserFeatureDetector

Browse Source
This commit is contained in:
Maria Dimashova
2010-11-11 15:45:54 +00:00
parent c8e93da01d
commit b12588f702
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/features2d/src/detectors.cpp
View File

@@ -202,19 +202,18 @@ void MserFeatureDetector::detect( const Mat& image, vector<KeyPoint>& keypoints,
{ {
vector<vector<Point> > msers; vector<vector<Point> > msers;
Mat grayImage = image; mser(image, msers, mask);
if( image.type() != CV_8U ) cvtColor( image, grayImage, CV_BGR2GRAY );
mser(grayImage, msers, mask); keypoints.clear();
keypoints.resize( msers.size() );
vector<vector<Point> >::const_iterator contour_it = msers.begin(); vector<vector<Point> >::const_iterator contour_it = msers.begin();
vector<KeyPoint>::iterator keypoint_it = keypoints.begin(); for( ; contour_it != msers.end(); ++contour_it )
for( ; contour_it != msers.end(); ++contour_it, ++keypoint_it )
{ {
// TODO check transformation from MSER region to KeyPoint // TODO check transformation from MSER region to KeyPoint
RotatedRect rect = fitEllipse(Mat(*contour_it)); RotatedRect rect = fitEllipse(Mat(*contour_it));
*keypoint_it = KeyPoint( rect.center, sqrt(rect.size.height*rect.size.width), rect.angle); float diam = sqrt(rect.size.height*rect.size.width);
if( diam > std::numeric_limits<float>::epsilon() )
keypoints.push_back( KeyPoint( rect.center, diam, rect.angle) );
} }
} }