Skip to content

O
opencv
Commit 88cc054f authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #1369 from StevenPuttemans:fix_featuretracker

parents 9c7ba848 15f1a48e
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
modules/contrib/CMakeLists.txt
View file @ 88cc054f
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)
modules/contrib/src/featuretracker.cpp
View file @ 88cc054f
...@@ -45,6 +45,12 @@ ...@@ -45,6 +45,12 @@
#include "opencv2/calib3d/calib3d.hpp" #include "opencv2/calib3d/calib3d.hpp"
#include "opencv2/contrib/hybridtracker.hpp" #include "opencv2/contrib/hybridtracker.hpp"
#ifdef HAVE_OPENCV_NONFREE
#include "opencv2/nonfree/nonfree.hpp"
static bool makeUseOfNonfree = initModule_nonfree();
#endif
using namespace cv; using namespace cv;
CvFeatureTracker::CvFeatureTracker(CvFeatureTrackerParams _params) : CvFeatureTracker::CvFeatureTracker(CvFeatureTrackerParams _params) :
......
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