generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added optional dependency stitching->nonfree. When nonfree is available, make sure linker does not throw it away.

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-03-31 17:25:19 +00:00
parent 1c616f43ba
commit 5c615ec28f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/stitching/CMakeLists.txt
View File

@ -1,3 +1,3 @@
set(the_description "Images stitching") 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)

6
modules/stitching/src/matchers.cpp
View File

@ -50,6 +50,12 @@ using namespace cv::detail;
using namespace cv::gpu; using namespace cv::gpu;
#endif #endif
#ifdef HAVE_OPENCV_NONFREE
#include "opencv2/nonfree/nonfree.hpp"
static bool makeUseOfNonfree = initModule_nonfree();
#endif
namespace { namespace {
struct DistIdxPair struct DistIdxPair