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

merged all the latest changes from 2.4 to trunk

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-04-13 21:50:59 +00:00
parent 020f9a6047
commit 2fd1e2ea57
416 changed files with 12852 additions and 6070 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/traincascade/imagestorage.cpp
View File

@@ -150,8 +150,10 @@ bool CvCascadeImageReader::PosReader::get( Mat &_img )
{
CV_Assert( _img.rows * _img.cols == vecSize );
uchar tmp = 0;
fread( &tmp, sizeof( tmp ), 1, file );
fread( vec, sizeof( vec[0] ), vecSize, file );
size_t elements_read = fread( &tmp, sizeof( tmp ), 1, file );
CV_Assert(elements_read == 1);
elements_read = fread( vec, sizeof( vec[0] ), vecSize, file );
CV_Assert(elements_read == (size_t)(vecSize));
if( feof( file ) || last++ >= count )
return false;