Merge remote-tracking branch 'upstream/3.4' into merge-3.4
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
#include "opencv2/stitching/warpers.hpp"
|
||||
|
||||
#ifdef HAVE_OPENCV_XFEATURES2D
|
||||
#include "opencv2/xfeatures2d.hpp"
|
||||
#include "opencv2/xfeatures2d/nonfree.hpp"
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user