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

Merge pull request #771 from gpsinghsandhu:surfFeatureFinder

Browse Source
This commit is contained in:
Andrey Kamaev 2013-04-05 12:59:22 +04:00 committed by OpenCV Buildbot
commit 977562b614
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/stitching/src/matchers.cpp
View File

@ -348,8 +348,15 @@ SurfFeaturesFinder::SurfFeaturesFinder(double hess_thresh, int num_octaves, int
void SurfFeaturesFinder::find(const Mat &image, ImageFeatures &features)
{
Mat gray_image;
CV_Assert(image.type() == CV_8UC3);
cvtColor(image, gray_image, CV_BGR2GRAY);
CV_Assert((image.type() == CV_8UC3) || (image.type() == CV_8UC1));
if(image.type() == CV_8UC3)
{
cvtColor(image, gray_image, CV_BGR2GRAY);
}
else
{
gray_image = image;
}
if (surf == 0)
{
detector_->detect(gray_image, features.keypoints);