From 3f37e034a0ccd0f13c87adb57e4f9fde53f1d4fc Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Fri, 17 Oct 2014 16:09:09 +0400 Subject: [PATCH] another fix in opencv_world --- modules/stitching/src/matchers.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/stitching/src/matchers.cpp b/modules/stitching/src/matchers.cpp index 0d6edb679..94b788395 100644 --- a/modules/stitching/src/matchers.cpp +++ b/modules/stitching/src/matchers.cpp @@ -48,9 +48,8 @@ using namespace cv::cuda; #ifdef HAVE_OPENCV_XFEATURES2D #include "opencv2/xfeatures2d.hpp" -#endif - using xfeatures2d::SURF; +#endif namespace { @@ -321,6 +320,7 @@ void FeaturesFinder::operator ()(InputArray image, ImageFeatures &features, cons SurfFeaturesFinder::SurfFeaturesFinder(double hess_thresh, int num_octaves, int num_layers, int num_octaves_descr, int num_layers_descr) { +#ifdef HAVE_OPENCV_XFEATURES2D if (num_octaves_descr == num_octaves && num_layers_descr == num_layers) { surf = SURF::create(); @@ -345,6 +345,9 @@ SurfFeaturesFinder::SurfFeaturesFinder(double hess_thresh, int num_octaves, int extractor_->set(SURF::NOCTAVES, num_octaves_descr); extractor_->set(SURF::NOCTAVE_LAYERS, num_layers_descr); } +#else + CV_Error( Error::StsNotImplemented, "OpenCV was built without SURF support" ); +#endif } void SurfFeaturesFinder::find(InputArray image, ImageFeatures &features)