opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-19 02:16:34 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/TLD/VOT2015_Datasets_Support' into TLD/VOT2015_Datasets_Support

Browse Source 
Conflicts:
	modules/datasets/src/track_vot.cpp
	modules/tracking/include/opencv2/tracking/tracker.hpp
This commit is contained in:
Vladimir
2015-08-28 01:45:46 +09:00
parent cbf79333bd beaceb4d17
commit bc08607d13
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/tracking/include/opencv2/tracking/tracker.hpp
View File

@@ -1256,7 +1256,7 @@ class CV_EXPORTS_W TrackerKCF : public Tracker
@sa Tracker, MultiTrackerTLD
*/
class CV_EXPORTS_W MultiTracker
class CV_EXPORTS_W MultiTracker_Alt
{
public:
/** @brief Constructor for Multitracker