mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-19 15:04:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

a few more little fixes in read_csv

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-12-04 18:42:09 +00:00
parent 33d23ef27a
commit ea3ccc6d61
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/ml/src/data.cpp
View File

@ -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);