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

another fix in opencv_world

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-10-17 16:09:09 +04:00
parent 8d9e619412
commit 3f37e034a0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,9 +48,8 @@ using namespace cv::cuda;
#ifdef HAVE_OPENCV_XFEATURES2D #ifdef HAVE_OPENCV_XFEATURES2D
#include "opencv2/xfeatures2d.hpp" #include "opencv2/xfeatures2d.hpp"
#endif
using xfeatures2d::SURF; using xfeatures2d::SURF;
#endif
namespace { namespace {
@ -321,6 +320,7 @@ void FeaturesFinder::operator ()(InputArray image, ImageFeatures &features, cons
SurfFeaturesFinder::SurfFeaturesFinder(double hess_thresh, int num_octaves, int num_layers, SurfFeaturesFinder::SurfFeaturesFinder(double hess_thresh, int num_octaves, int num_layers,
int num_octaves_descr, int num_layers_descr) int num_octaves_descr, int num_layers_descr)
{ {
#ifdef HAVE_OPENCV_XFEATURES2D
if (num_octaves_descr == num_octaves && num_layers_descr == num_layers) if (num_octaves_descr == num_octaves && num_layers_descr == num_layers)
{ {
surf = SURF::create(); 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::NOCTAVES, num_octaves_descr);
extractor_->set(SURF::NOCTAVE_LAYERS, num_layers_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) void SurfFeaturesFinder::find(InputArray image, ImageFeatures &features)