Commit f515337b authored by Alexey Spizhevoy's avatar Alexey Spizhevoy

Added handling of stitching module into OpenCVConfig.cmake.in

parent f69bb742
...@@ -71,7 +71,7 @@ LINK_DIRECTORIES(${OpenCV_LIB_DIR}) ...@@ -71,7 +71,7 @@ LINK_DIRECTORIES(${OpenCV_LIB_DIR})
# ==================================================================== # ====================================================================
# Link libraries: e.g. libopencv_core.so, opencv_imgproc220d.lib, etc... # 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 #libraries order is very important because linker from Android NDK is one-pass linker
if(NOT ANDROID) if(NOT ANDROID)
LIST(INSERT OpenCV_LIB_COMPONENTS 0 opencv_gpu) LIST(INSERT OpenCV_LIB_COMPONENTS 0 opencv_gpu)
......
...@@ -152,7 +152,7 @@ protected: ...@@ -152,7 +152,7 @@ protected:
class CV_EXPORTS BestOf2NearestMatcher : public FeaturesMatcher class CV_EXPORTS BestOf2NearestMatcher : public FeaturesMatcher
{ {
public: 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); int num_matches_thresh2 = 6);
void collectGarbage(); void collectGarbage();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment