generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merged 2.4 into trunk

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-04-30 14:33:52 +00:00
parent 3f1c6d7357
commit d5a0088bbe
194 changed files with 10158 additions and 8225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
@@ -743,7 +740,12 @@ const CvMat* CvMLData::get_var_idx()
void CvMLData::chahge_var_idx( int vi, bool state )
{
CV_FUNCNAME( "CvMLData::get_responses_ptr" );
change_var_idx( vi, state );
}
void CvMLData::change_var_idx( int vi, bool state )
{
CV_FUNCNAME( "CvMLData::change_var_idx" );
__BEGIN__;
int var_count = 0;