From: StevenPuttemans <steven.puttemans@lessius.eu>
Date: Fri, 30 Aug 2013 10:50:06 +0000 (+0200)
Subject: Updated with comments of speclad
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1314^2~908^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=15f1a48ec407157c6d7444171dfb6bdb634ec242;p=platform%2Fupstream%2Fopencv.git

Updated with comments of speclad
---

diff --git a/modules/contrib/CMakeLists.txt b/modules/contrib/CMakeLists.txt
index 26af1e3..f402016 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 b8d40de..902b6ae 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) :