Merge pull request #17317 from Yosshi999:prevent-build-failure-without-flann

2020-05-19 08:30:54 +00:00 · 2020-05-19 08:30:54 +00:00 · 9039284d96
commit 9039284d96
parent 593af7287b c0f435349a
1 changed files with 2 additions and 1 deletions
--- a/modules/features2d/test/test_matchers_algorithmic.cpp
+++ b/modules/features2d/test/test_matchers_algorithmic.cpp
@ -558,6 +558,7 @@ TEST( Features2d_DMatch, read_write )
    ASSERT_NE( strstr(str.c_str(), "4.5"), (char*)0 );
 }

+#ifdef HAVE_OPENCV_FLANN
 TEST( Features2d_FlannBasedMatcher, read_write )
 {
    static const char* ymlfile = "%YAML:1.0\n---\n"
@ -594,7 +595,7 @@ TEST( Features2d_FlannBasedMatcher, read_write )

    EXPECT_EQ(ymlfile, out);
 }
-
+#endif

 TEST(Features2d_DMatch, issue_11855)
 {