generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added cv::EM, moved CvEM to legacy, added/updated tests

Browse Source
This commit is contained in:
Maria Dimashova
2012-04-06 09:26:11 +00:00
parent cdc5bbc0bc
commit 85fa0e7763
13 changed files with 1726 additions and 1449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/contrib/include/opencv2/contrib/hybridtracker.hpp
View File

@@ -66,7 +66,7 @@ struct CV_EXPORTS CvMotionModel
}
float low_pass_gain; // low pass gain
CvEMParams em_params; // EM parameters
cv::EM::Params em_params; // EM parameters
};
// Mean Shift Tracker parameters for specifying use of HSV channel and CamShift parameters.
@@ -109,7 +109,7 @@ struct CV_EXPORTS CvHybridTrackerParams
float ms_tracker_weight;
CvFeatureTrackerParams ft_params;
CvMeanShiftTrackerParams ms_params;
CvEMParams em_params;
cv::EM::Params em_params;
int motion_model;
float low_pass_gain;
};
@@ -182,7 +182,7 @@ private:
CvMat* samples;
CvMat* labels;
CvEM em_model;
cv::EM em_model;
Rect prev_window;
Point2f prev_center;