added optional dependency stitching->nonfree. When nonfree is available, make sure...

diff --git a/modules/stitching/CMakeLists.txt b/modules/stitching/CMakeLists.txt
index 88fd865..5d48bd3 100644 (file)
--- a/modules/stitching/CMakeLists.txt
+++ b/modules/stitching/CMakeLists.txt
@@ -1,3 +1,3 @@
 set(the_description "Images stitching")
-ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect OPTIONAL opencv_gpu)
+ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect OPTIONAL opencv_gpu opencv_nonfree)
 

diff --git a/modules/stitching/src/matchers.cpp b/modules/stitching/src/matchers.cpp
index 1cc630e..9cfd343 100644 (file)
--- a/modules/stitching/src/matchers.cpp
+++ b/modules/stitching/src/matchers.cpp
@@ -50,6 +50,12 @@ using namespace cv::detail;
 using namespace cv::gpu;\r
 #endif\r
 \r
+#ifdef HAVE_OPENCV_NONFREE\r
+#include "opencv2/nonfree/nonfree.hpp"\r
+\r
+static bool makeUseOfNonfree = initModule_nonfree();\r
+#endif\r
+\r
 namespace {\r
 \r
 struct DistIdxPair\r