From ad69756bc90e93de7a2abcefb3873473da775d5f Mon Sep 17 00:00:00 2001 From: Vladimir Date: Tue, 18 Aug 2015 15:03:46 +0900 Subject: [PATCH] Restored *protected:*' in tracker.hpp --- modules/tracking/src/multiTracker.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/tracking/src/multiTracker.cpp b/modules/tracking/src/multiTracker.cpp index e8c473d1b..273a454cb 100644 --- a/modules/tracking/src/multiTracker.cpp +++ b/modules/tracking/src/multiTracker.cpp @@ -130,7 +130,7 @@ namespace cv trackerPtr = trackers[k]; tracker = static_cast(trackerPtr); //TLD Model Extraction - tldModel = ((tld::TrackerTLDModel*)static_cast(tracker->model)); + tldModel = ((tld::TrackerTLDModel*)static_cast(tracker->getModel())); data = tracker->data; data->frameNum++; @@ -311,7 +311,7 @@ namespace cv trackerPtr = trackers[k]; tracker = static_cast(trackerPtr); //TLD Model Extraction - tldModel = ((tld::TrackerTLDModel*)static_cast(tracker->model)); + tldModel = ((tld::TrackerTLDModel*)static_cast(tracker->getModel())); //Optimized variance calculation bool varPass = (windowVar > tld::VARIANCE_THRESHOLD * *tldModel->detector->originalVariancePtr); @@ -340,7 +340,7 @@ namespace cv trackerPtr = trackers[k]; tracker = static_cast(trackerPtr); //TLD Model Extraction - tldModel = ((tld::TrackerTLDModel*)static_cast(tracker->model)); + tldModel = ((tld::TrackerTLDModel*)static_cast(tracker->getModel())); for (int i = 0; i < (int)varBuffer[k].size(); i++) @@ -382,7 +382,7 @@ namespace cv trackerPtr = trackers[k]; tracker = static_cast(trackerPtr); //TLD Model Extraction - tldModel = ((tld::TrackerTLDModel*)static_cast(tracker->model)); + tldModel = ((tld::TrackerTLDModel*)static_cast(tracker->getModel())); npos = 0; nneg = 0; @@ -505,7 +505,7 @@ namespace cv trackerPtr = trackers[k]; tracker = static_cast(trackerPtr); //TLD Model Extraction - tldModel = ((tld::TrackerTLDModel*)static_cast(tracker->model)); + tldModel = ((tld::TrackerTLDModel*)static_cast(tracker->getModel())); //Optimized variance calculation bool varPass = (windowVar > tld::VARIANCE_THRESHOLD * *tldModel->detector->originalVariancePtr); @@ -534,7 +534,7 @@ namespace cv trackerPtr = trackers[k]; tracker = static_cast(trackerPtr); //TLD Model Extraction - tldModel = ((tld::TrackerTLDModel*)static_cast(tracker->model)); + tldModel = ((tld::TrackerTLDModel*)static_cast(tracker->getModel())); for (int i = 0; i < (int)varBuffer[k].size(); i++) @@ -576,7 +576,7 @@ namespace cv trackerPtr = trackers[k]; tracker = static_cast(trackerPtr); //TLD Model Extraction - tldModel = ((tld::TrackerTLDModel*)static_cast(tracker->model)); + tldModel = ((tld::TrackerTLDModel*)static_cast(tracker->getModel())); npos = 0; nneg = 0; maxSc = -5.0;