Merge pull request #2796 from berak:b_3674_24

0ea572d7 · Alexander Alekhin · OpenCV Buildbot · aa170cfb · 2bacd8b7 · 0ea572d7
Commit 0ea572d7 authored May 28, 2014 by Alexander Alekhin Committed by OpenCV Buildbot May 28, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

em.cpp modules/ml/src/em.cpp +2 -2

No files found.
--- a/modules/ml/src/em.cpp
+++ b/modules/ml/src/em.cpp
@@ -135,7 +135,7 @@ Vec2d EM::predict(InputArray _sample, OutputArray _probs) const
        sample.convertTo(tmp, CV_64FC1);
        sample = tmp;
    }
-    sample.reshape(1, 1);
+    sample = sample.reshape(1, 1);

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