Merge pull request #771 from gpsinghsandhu:surfFeatureFinder

977562b6 · Andrey Kamaev · OpenCV Buildbot · 3b6a82b5 · 69127e41 · 977562b6
Commit 977562b6 authored Apr 05, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Apr 05, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

matchers.cpp modules/stitching/src/matchers.cpp +9 -2

No files found.
--- a/modules/stitching/src/matchers.cpp
+++ b/modules/stitching/src/matchers.cpp
@@ -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);