diff --git a/modules/tracking/src/multiTracker.cpp b/modules/tracking/src/multiTracker.cpp index d5fef17c9..0e6133ce0 100644 --- a/modules/tracking/src/multiTracker.cpp +++ b/modules/tracking/src/multiTracker.cpp @@ -71,9 +71,9 @@ namespace cv //best overlap around 92% Mat_ standardPatch(tld::STANDARD_PATCH_SIZE, tld::STANDARD_PATCH_SIZE); - std::vector> detectorResults(targetNum); - std::vector> candidates(targetNum); - std::vector> candidatesRes(targetNum); + std::vector > detectorResults(targetNum); + std::vector > candidates(targetNum); + std::vector > candidatesRes(targetNum); std::vector tmpCandidates(targetNum); std::vector detect_flgs(targetNum); std::vector trackerNeedsReInit(targetNum); @@ -221,8 +221,8 @@ namespace cv return true; } - void detect_all(const Mat& img, const Mat& imgBlurred, std::vector& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch >> &patches, std::vector &detect_flgs, - std::vector> &trackers) + void detect_all(const Mat& img, const Mat& imgBlurred, std::vector& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches, std::vector &detect_flgs, + std::vector > &trackers) { //TLD Tracker data extraction Tracker* trackerPtr = trackers[0]; @@ -245,8 +245,8 @@ namespace cv int scaleID; std::vector resized_imgs, blurred_imgs; - std::vector > varBuffer(trackers.size()), ensBuffer(trackers.size()); - std::vector > varScaleIDs(trackers.size()), ensScaleIDs(trackers.size()); + std::vector > varBuffer(trackers.size()), ensBuffer(trackers.size()); + std::vector > varScaleIDs(trackers.size()), ensScaleIDs(trackers.size()); std::vector tmpP; std::vector tmpI; @@ -457,8 +457,8 @@ namespace cv //printf("NN: %d\t%f\n", patches.size(), t); } - void ocl_detect_all(const Mat& img, const Mat& imgBlurred, std::vector& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch >> &patches, std::vector &detect_flgs, - std::vector> &trackers) + void ocl_detect_all(const Mat& img, const Mat& imgBlurred, std::vector& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches, std::vector &detect_flgs, + std::vector > &trackers) { //TLD Tracker data extraction Tracker* trackerPtr = trackers[0]; @@ -481,8 +481,8 @@ namespace cv int scaleID; std::vector resized_imgs, blurred_imgs; - std::vector > varBuffer(trackers.size()), ensBuffer(trackers.size()); - std::vector > varScaleIDs(trackers.size()), ensScaleIDs(trackers.size()); + std::vector > varBuffer(trackers.size()), ensBuffer(trackers.size()); + std::vector > varScaleIDs(trackers.size()), ensScaleIDs(trackers.size()); std::vector tmpP; std::vector tmpI; diff --git a/modules/tracking/src/multiTracker.hpp b/modules/tracking/src/multiTracker.hpp index a2b0a01ea..9dc65c0e3 100644 --- a/modules/tracking/src/multiTracker.hpp +++ b/modules/tracking/src/multiTracker.hpp @@ -7,10 +7,10 @@ namespace cv { - void detect_all(const Mat& img, const Mat& imgBlurred, std::vector& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch >> &patches, - std::vector& detect_flgs, std::vector>& trackers); - void ocl_detect_all(const Mat& img, const Mat& imgBlurred, std::vector& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch >> &patches, - std::vector& detect_flgs, std::vector>& trackers); + void detect_all(const Mat& img, const Mat& imgBlurred, std::vector& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches, + std::vector& detect_flgs, std::vector >& trackers); + void ocl_detect_all(const Mat& img, const Mat& imgBlurred, std::vector& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches, + std::vector& detect_flgs, std::vector >& trackers); std::vector debugStack[10]; } #endif \ No newline at end of file