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

Merge pull request #2796 from berak:b_3674_24

Browse Source
This commit is contained in:
Alexander Alekhin 2014-05-28 13:28:30 +04:00 committed by OpenCV Buildbot
commit 0ea572d772
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ml/src/em.cpp
View File

@ -135,7 +135,7 @@ Vec2d EM::predict(InputArray _sample, OutputArray _probs) const
sample.convertTo(tmp, CV_64FC1); sample.convertTo(tmp, CV_64FC1);
sample = tmp; sample = tmp;
} }
sample.reshape(1, 1); sample = sample.reshape(1, 1);
Mat probs; Mat probs;
if( _probs.needed() ) if( _probs.needed() )
@ -266,7 +266,7 @@ void EM::setTrainData(int startStep, const Mat& samples,
if(weights0 && (startStep == EM::START_E_STEP && covs0)) if(weights0 && (startStep == EM::START_E_STEP && covs0))
{ {
weights0->convertTo(weights, CV_64FC1); weights0->convertTo(weights, CV_64FC1);
weights.reshape(1,1); weights = weights.reshape(1,1);
preprocessProbability(weights); preprocessProbability(weights);
} }