mirror of
https://github.com/opencv/opencv.git
synced 2026-07-30 07:43:03 +04:00
made flann dependency for features2d optional
it will allow to build features2d even if flann module is not available
This commit is contained in:
@@ -43,8 +43,12 @@
|
||||
#ifndef OPENCV_FEATURES_2D_HPP
|
||||
#define OPENCV_FEATURES_2D_HPP
|
||||
|
||||
#include "opencv2/opencv_modules.hpp"
|
||||
#include "opencv2/core.hpp"
|
||||
|
||||
#ifdef HAVE_OPENCV_FLANN
|
||||
#include "opencv2/flann/miniflann.hpp"
|
||||
#endif
|
||||
|
||||
/**
|
||||
@defgroup features2d 2D Features Framework
|
||||
@@ -1099,6 +1103,7 @@ protected:
|
||||
bool crossCheck;
|
||||
};
|
||||
|
||||
#if defined(HAVE_OPENCV_FLANN) || defined(CV_DOXYGEN)
|
||||
|
||||
/** @brief Flann-based descriptor matcher.
|
||||
|
||||
@@ -1145,6 +1150,8 @@ protected:
|
||||
int addedDescCount;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
//! @} features2d_match
|
||||
|
||||
/****************************************************************************************\
|
||||
|
||||
Reference in New Issue
Block a user