From caaf440bd8d4344aafcda2fab0810e2090b94fca Mon Sep 17 00:00:00 2001 From: StevenPuttemans Date: Thu, 29 Aug 2013 16:09:48 +0200 Subject: [PATCH 1/2] Added fix in CMakeLists.txt for contrib module. --- modules/contrib/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/contrib/CMakeLists.txt b/modules/contrib/CMakeLists.txt index 81c9ea4aa..26af1e352 100644 --- a/modules/contrib/CMakeLists.txt +++ b/modules/contrib/CMakeLists.txt @@ -1 +1 @@ -ocv_define_module(contrib opencv_imgproc opencv_calib3d opencv_features2d opencv_ml opencv_video opencv_objdetect OPTIONAL opencv_highgui) +ocv_define_module(contrib opencv_imgproc opencv_calib3d opencv_features2d opencv_ml opencv_video opencv_objdetect opencv_nonfree OPTIONAL opencv_highgui) From 15f1a48ec407157c6d7444171dfb6bdb634ec242 Mon Sep 17 00:00:00 2001 From: StevenPuttemans Date: Fri, 30 Aug 2013 12:50:06 +0200 Subject: [PATCH 2/2] Updated with comments of speclad --- modules/contrib/CMakeLists.txt | 2 +- modules/contrib/src/featuretracker.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/contrib/CMakeLists.txt b/modules/contrib/CMakeLists.txt index 26af1e352..f402016b2 100644 --- a/modules/contrib/CMakeLists.txt +++ b/modules/contrib/CMakeLists.txt @@ -1 +1 @@ -ocv_define_module(contrib opencv_imgproc opencv_calib3d opencv_features2d opencv_ml opencv_video opencv_objdetect opencv_nonfree OPTIONAL opencv_highgui) +ocv_define_module(contrib opencv_imgproc opencv_calib3d opencv_features2d opencv_ml opencv_video opencv_objdetect OPTIONAL opencv_highgui opencv_nonfree) diff --git a/modules/contrib/src/featuretracker.cpp b/modules/contrib/src/featuretracker.cpp index b8d40deb0..902b6aedf 100644 --- a/modules/contrib/src/featuretracker.cpp +++ b/modules/contrib/src/featuretracker.cpp @@ -45,6 +45,12 @@ #include "opencv2/calib3d/calib3d.hpp" #include "opencv2/contrib/hybridtracker.hpp" +#ifdef HAVE_OPENCV_NONFREE +#include "opencv2/nonfree/nonfree.hpp" + +static bool makeUseOfNonfree = initModule_nonfree(); +#endif + using namespace cv; CvFeatureTracker::CvFeatureTracker(CvFeatureTrackerParams _params) :