made flann dependency for features2d optional

it will allow to build features2d even if flann module is not available
This commit is contained in:
Vladislav Vinogradov
2017-10-13 11:01:48 +03:00
parent 1ba29cc95d
commit 26fe8bd4f2
8 changed files with 36 additions and 3 deletions
@@ -536,12 +536,14 @@ TEST( Features2d_DescriptorMatcher_BruteForce, regression )
test.safe_run();
}
#ifdef HAVE_OPENCV_FLANN
TEST( Features2d_DescriptorMatcher_FlannBased, regression )
{
CV_DescriptorMatcherTest test( "descriptor-matcher-flann-based",
DescriptorMatcher::create("FlannBased"), 0.04f );
test.safe_run();
}
#endif
TEST( Features2d_DMatch, read_write )
{