From f515337beb1a119bcb6fc25a60f9ce890b428930 Mon Sep 17 00:00:00 2001 From: Alexey Spizhevoy Date: Thu, 8 Sep 2011 15:03:35 +0000 Subject: [PATCH] Added handling of stitching module into OpenCVConfig.cmake.in --- OpenCVConfig.cmake.in | 2 +- modules/stitching/include/opencv2/stitching/detail/matchers.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenCVConfig.cmake.in b/OpenCVConfig.cmake.in index ff6016adbb..9d47ce36e4 100644 --- a/OpenCVConfig.cmake.in +++ b/OpenCVConfig.cmake.in @@ -71,7 +71,7 @@ LINK_DIRECTORIES(${OpenCV_LIB_DIR}) # ==================================================================== # Link libraries: e.g. libopencv_core.so, opencv_imgproc220d.lib, etc... # ==================================================================== -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 ) +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) #libraries order is very important because linker from Android NDK is one-pass linker if(NOT ANDROID) LIST(INSERT OpenCV_LIB_COMPONENTS 0 opencv_gpu) diff --git a/modules/stitching/include/opencv2/stitching/detail/matchers.hpp b/modules/stitching/include/opencv2/stitching/detail/matchers.hpp index 2769a58742..1a71de51c6 100644 --- 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 { public: - BestOf2NearestMatcher(bool try_use_gpu = true, float match_conf = 0.65f, int num_matches_thresh1 = 6, + BestOf2NearestMatcher(bool try_use_gpu = false, float match_conf = 0.65f, int num_matches_thresh1 = 6, int num_matches_thresh2 = 6); void collectGarbage();