Added handling of stitching module into OpenCVConfig.cmake.in

diff --git a/OpenCVConfig.cmake.in b/OpenCVConfig.cmake.in
index ff6016a..9d47ce3 100644 (file)
--- a/OpenCVConfig.cmake.in
+++ b/OpenCVConfig.cmake.in
@@ -71,7 +71,7 @@ LINK_DIRECTORIES(${OpenCV_LIB_DIR})
 # ====================================================================\r
 # Link libraries: e.g.   libopencv_core.so, opencv_imgproc220d.lib, etc...\r
 # ====================================================================\r
-SET(OpenCV_LIB_COMPONENTS opencv_contrib opencv_legacy opencv_objdetect opencv_calib3d opencv_features2d opencv_video opencv_highgui opencv_ml opencv_imgproc opencv_flann opencv_core )\r
+SET(OpenCV_LIB_COMPONENTS opencv_contrib opencv_legacy opencv_objdetect opencv_calib3d opencv_features2d opencv_video opencv_highgui opencv_ml opencv_imgproc opencv_flann opencv_core opencv_stitching)\r
 #libraries order is very important because linker from Android NDK is one-pass linker\r
 if(NOT ANDROID)\r
     LIST(INSERT OpenCV_LIB_COMPONENTS 0 opencv_gpu)\r

diff --git a/modules/stitching/include/opencv2/stitching/detail/matchers.hpp b/modules/stitching/include/opencv2/stitching/detail/matchers.hpp
index 2769a58..1a71de5 100644 (file)
--- a/modules/stitching/include/opencv2/stitching/detail/matchers.hpp
+++ b/modules/stitching/include/opencv2/stitching/detail/matchers.hpp
@@ -152,7 +152,7 @@ protected:
 class CV_EXPORTS BestOf2NearestMatcher : public FeaturesMatcher\r
 {\r
 public:\r
-    BestOf2NearestMatcher(bool try_use_gpu = true, float match_conf = 0.65f, int num_matches_thresh1 = 6,\r
+    BestOf2NearestMatcher(bool try_use_gpu = false, float match_conf = 0.65f, int num_matches_thresh1 = 6,\r
                           int num_matches_thresh2 = 6);\r
 \r
     void collectGarbage();\r