From ea3ccc6d61dc468d56d96512fd8b6a9b9e13489a Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Sat, 4 Dec 2010 18:42:09 +0000 Subject: [PATCH] a few more little fixes in read_csv --- modules/ml/src/data.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/ml/src/data.cpp b/modules/ml/src/data.cpp index 8e52d71b3e..67cb10b3b6 100644 --- a/modules/ml/src/data.cpp +++ b/modules/ml/src/data.cpp @@ -165,7 +165,7 @@ int CvMLData::read_csv(const char* filename) if( !fgets_chomp( buf, M, file )) { fclose(file); - return 1; + return -1; } for( ptr = buf; *ptr != '\0'; ptr++ ) cols_count += (*ptr == delimiter); @@ -173,7 +173,7 @@ int CvMLData::read_csv(const char* filename) if ( cols_count == 0) { fclose(file); - return 1; + return -1; } cols_count++; @@ -194,18 +194,17 @@ int CvMLData::read_csv(const char* filename) if (!token) { fclose(file); - return 1; + return -1; } for (int i = 0; i < cols_count-1; i++) { - str_to_flt_elem( token, el_ptr[i], type); var_types_ptr[i] |= type; token = strtok(NULL, str_delimiter); if (!token) { fclose(file); - return 1; + return -1; } } str_to_flt_elem( token, el_ptr[cols_count-1], type);