Skip to content

O
opencv
Commit 34aa4e45 authored by Maksim Shabunin's avatar Maksim Shabunin
Browse files
Options

Merge pull request #5151 from mshabunin:fix-training-data-corruption

parents e9539061 447b8bf5
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
modules/ml/src/inner_functions.cpp
View file @ 34aa4e45
...@@ -777,7 +777,8 @@ cvGetTrainSamples( const CvMat* train_data, int tflag, ...@@ -777,7 +777,8 @@ cvGetTrainSamples( const CvMat* train_data, int tflag,
__BEGIN__; __BEGIN__;
int i, j, var_count, sample_count, s_step, v_step; int i, j, var_count, sample_count;
size_t s_step, v_step, s;
bool copy_data; bool copy_data;
const float* data; const float* data;
const int *s_idx, *v_idx; const int *s_idx, *v_idx;
...@@ -815,7 +816,7 @@ cvGetTrainSamples( const CvMat* train_data, int tflag, ...@@ -815,7 +816,7 @@ cvGetTrainSamples( const CvMat* train_data, int tflag,
{ {
samples[0] = (float*)(samples + sample_count); samples[0] = (float*)(samples + sample_count);
if( tflag != CV_ROW_SAMPLE ) if( tflag != CV_ROW_SAMPLE )
CV_SWAP( s_step, v_step, i ); CV_SWAP( s_step, v_step, s );
for( i = 0; i < sample_count; i++ ) for( i = 0; i < sample_count; i++ )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment