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

fixed background image reader (thanks to albertzeyer for the patch - ticket #651)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-11-22 15:22:13 +00:00
parent d7c0c72b75
commit 79bcae4e52
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/haartraining/cvhaartraining.cpp
View File

@ -1227,9 +1227,11 @@ CvBackgroundData* icvCreateBackgroundData( const char* filename, CvSize winsize
while( !feof( input ) )
{
*imgfilename = '\0';
if( !fscanf( input, "%s", imgfilename ))
if( !fgets( imgfilename, PATH_MAX - (imgfilename - full) - 1, input ))
break;
len = (int)strlen( imgfilename );
if( len > 0 && imgfilename[len-1] == '\n' )
imgfilename[len-1] = 0, len--;
if( len > 0 )
{
if( (*imgfilename) == '#' ) continue; /* comment */
@ -1254,9 +1256,11 @@ CvBackgroundData* icvCreateBackgroundData( const char* filename, CvSize winsize
while( !feof( input ) )
{
*imgfilename = '\0';
if( !fscanf( input, "%s", imgfilename ))
if( !fgets( imgfilename, PATH_MAX - (imgfilename - full) - 1, input ))
break;
len = (int)strlen( imgfilename );
if( len > 0 && imgfilename[len-1] == '\n' )
imgfilename[len-1] = 0, len--;
if( len > 0 )
{
if( (*imgfilename) == '#' ) continue; /* comment */
@ -1351,11 +1355,11 @@ void icvGetNextFromBackgroundData( CvBackgroundData* data,
//#endif /* CV_VERBOSE */
img = cvLoadImage( data->filename[data->last++], 0 );
if( !img )
data->last %= data->count;
if( !img )
continue;
data->round += data->last / data->count;
data->round = data->round % (data->winsize.width * data->winsize.height);
data->last %= data->count;
offset.x = round % data->winsize.width;
offset.y = round / data->winsize.width;