Squashed commit of the following:

commit 5c379aa1b83ddd66f67b1a9c2ccd00e5bac8576e
Merge: e800800 3646967
Author: Сергей Нужный <snuzhny@stc-spb.ru>
Date:   Wed Apr 8 12:44:46 2015 +0300

    Merge branch 'master' of https://github.com/Nuzhny007/opencv

commit e800800bec8596127274f359e744723a7371b5b7
Author: Сергей Нужный <snuzhny@stc-spb.ru>
Date:   Wed Apr 8 12:43:38 2015 +0300

    Squashed commit of the following:

    commit 3646967deb9b48f45c44203e5c96836a8a180218
    Author: Сергей Нужный <snuzhny@stc-spb.ru>
    Date:   Tue Apr 7 15:48:30 2015 +0300

        Fix bug in SVM::trainAuto

    commit 0c24ccf53897c60dff19193623a97fc4713ce14e
    Author: Сергей Нужный <snuzhny@stc-spb.ru>
    Date:   Tue Apr 7 15:43:59 2015 +0300

        Revert "Fix bug in SVM::trainAuto"

        This reverts commit 225da0226e4e9d54e97aee488ac2b5ed4e813443.

    commit 225da0226e4e9d54e97aee488ac2b5ed4e813443
    Author: Сергей Нужный <snuzhny@stc-spb.ru>
    Date:   Tue Apr 7 15:09:47 2015 +0300

        Fix bug in SVM::trainAuto

commit 3646967deb9b48f45c44203e5c96836a8a180218
Author: Сергей Нужный <snuzhny@stc-spb.ru>
Date:   Tue Apr 7 15:48:30 2015 +0300

    Fix bug in SVM::trainAuto

commit 0c24ccf53897c60dff19193623a97fc4713ce14e
Author: Сергей Нужный <snuzhny@stc-spb.ru>
Date:   Tue Apr 7 15:43:59 2015 +0300

    Revert "Fix bug in SVM::trainAuto"

    This reverts commit 225da0226e4e9d54e97aee488ac2b5ed4e813443.

commit 225da0226e4e9d54e97aee488ac2b5ed4e813443
Author: Сергей Нужный <snuzhny@stc-spb.ru>
Date:   Tue Apr 7 15:09:47 2015 +0300

    Fix bug in SVM::trainAuto

diff --git a/modules/ml/src/svm.cpp b/modules/ml/src/svm.cpp
index 449eb8d..95b5fb9 100644 (file)
--- a/modules/ml/src/svm.cpp
+++ b/modules/ml/src/svm.cpp
@@ -1787,7 +1787,7 @@ public:
                 if( !do_train( temp_train_samples, temp_train_responses ))
                     continue;
 
-                for( i = 0; i < test_sample_count; i++ )
+                for( i = 0; i < train_sample_count; i++ )
                 {
                     j = sidx[(i+start+train_sample_count) % sample_count];
                     memcpy(temp_train_samples.ptr(i), samples.ptr(j), sample_size);