From 41c47a84fc55aa2eacc76c1ccb5288e265a493df Mon Sep 17 00:00:00 2001 From: E Sommerlade Date: Wed, 26 Oct 2016 15:59:44 +0100 Subject: [PATCH] restored Parameters() constructor to maintain ABI compatibility. Added CV_EXPORTS to nested class --- .../include/opencv2/objdetect/detection_based_tracker.hpp | 8 ++------ modules/objdetect/src/detection_based_tracker.cpp | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp b/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp index 14845c47f8..44213a818a 100644 --- a/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp +++ b/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp @@ -59,16 +59,12 @@ namespace cv class CV_EXPORTS DetectionBasedTracker { public: - struct Parameters + struct CV_EXPORTS Parameters { int maxTrackLifetime; int minDetectionPeriod; //the minimal time between run of the big object detector (on the whole frame) in ms (1000 mean 1 sec), default=0 - Parameters() - { - maxTrackLifetime=5; - minDetectionPeriod=0; - } + Parameters(); }; class IDetector diff --git a/modules/objdetect/src/detection_based_tracker.cpp b/modules/objdetect/src/detection_based_tracker.cpp index 0b643926e8..5bff2f9ab6 100644 --- a/modules/objdetect/src/detection_based_tracker.cpp +++ b/modules/objdetect/src/detection_based_tracker.cpp @@ -578,6 +578,12 @@ bool cv::DetectionBasedTracker::SeparateDetectionWork::communicateWithDetectingT return shouldHandleResult; } +cv::DetectionBasedTracker::Parameters::Parameters() +{ + maxTrackLifetime = 5; + minDetectionPeriod = 0; +} + cv::DetectionBasedTracker::InnerParameters::InnerParameters() { numLastPositionsToTrack=4;