Merge pull request #1369 from StevenPuttemans:fix_featuretracker

88cc054f · Roman Donchenko · OpenCV Buildbot · 9c7ba848 · 15f1a48e · 88cc054f
Commit 88cc054f authored Oct 17, 2013 by Roman Donchenko Committed by OpenCV Buildbot Oct 17, 2013
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

CMakeLists.txt modules/contrib/CMakeLists.txt +1 -1

featuretracker.cpp modules/contrib/src/featuretracker.cpp +6 -0

No files found.
--- a/modules/contrib/CMakeLists.txt
+++ b/modules/contrib/CMakeLists.txt
-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 OPTIONAL opencv_highgui opencv_nonfree)
--- 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) :