From eaf0d38f0307a8c0dcca8437609d6b3e5dedaa35 Mon Sep 17 00:00:00 2001 From: Maria Dimashova Date: Mon, 16 Apr 2012 13:50:10 +0000 Subject: [PATCH] removed changes of r8043; fixed 4 broken ml tests by other way --- modules/ml/src/data.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/ml/src/data.cpp b/modules/ml/src/data.cpp index 8afd1a963..2b44d384b 100644 --- a/modules/ml/src/data.cpp +++ b/modules/ml/src/data.cpp @@ -199,10 +199,7 @@ int CvMLData::read_csv(const char* filename) int type; token = strtok(buf, str_delimiter); if (!token) - { - fclose(file); - return -1; - } + break; for (int i = 0; i < cols_count-1; i++) { str_to_flt_elem( token, el_ptr[i], type); @@ -217,7 +214,7 @@ int CvMLData::read_csv(const char* filename) str_to_flt_elem( token, el_ptr[cols_count-1], type); var_types_ptr[cols_count-1] |= type; cvSeqPush( seq, el_ptr ); - if( !fgets_chomp( buf, M, file ) || !strchr( buf, delimiter ) ) + if( !fgets_chomp( buf, M, file ) ) break; } fclose(file);