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

Merge pull request #543 from taka-no-me:explicit_stl

Browse Source
This commit is contained in:
cuda-geek
2013-02-26 20:54:12 +04:00
committed by OpenCV Buildbot
parent 9f888fdb97 d586f4a103
commit 15e125c751
316 changed files with 5779 additions and 5993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ml/include/opencv2/ml/ml.hpp
View File

@@ -607,7 +607,7 @@ protected:
virtual void setTrainData(int startStep, const Mat& samples,
const Mat* probs0,
const Mat* means0,
const vector<Mat>* covs0,
const std::vector<Mat>* covs0,
const Mat* weights0);
bool doTrain(int startStep,
@@ -636,11 +636,11 @@ protected:
CV_PROP Mat weights;
CV_PROP Mat means;
CV_PROP vector<Mat> covs;
CV_PROP std::vector<Mat> covs;
vector<Mat> covsEigenValues;
vector<Mat> covsRotateMats;
vector<Mat> invCovsEigenValues;
std::vector<Mat> covsEigenValues;
std::vector<Mat> covsRotateMats;
std::vector<Mat> invCovsEigenValues;
Mat logWeightDivDet;
};
} // namespace cv