Merge branch 'master' of gitlab.utu.fi:nicolas.pope/ftl

components/operators/src/detectandtrack.cpp

@@ -107,7 +107,7 @@ bool DetectAndTrack::detect(const Mat &im) {
 		}
 
 		if (!found && (tracked_.size() < max_tracked_)) {
-			cv::Ptr<cv::Tracker> tracker = cv::TrackerKCF::create();
+			cv::Ptr<cv::Tracker> tracker = cv::TrackerCSRT::create();
 			tracker->init(im, obj);
 			tracked_.push_back({ id_max_++, obj, tracker, 0 });
 		}