fixed hundreds of warnings from MSVC 2010.

This commit is contained in:
Vadim Pisarevsky
2012-03-16 21:21:04 +00:00
parent 20cceb8fdf
commit 4985c1b632
83 changed files with 317 additions and 306 deletions

View File

@@ -89,7 +89,7 @@ cvExtractSURF( const CvArr* _img, const CvArr* _mask,
*_keypoints = cvCreateSeq(0, sizeof(CvSeq), sizeof(CvSURFPoint), storage);
if( _descriptors )
*_descriptors = cvCreateSeq( 0, sizeof(CvSeq), descr.cols*descr.elemSize(), storage );
*_descriptors = cvCreateSeq(0, sizeof(CvSeq), descr.cols*descr.elemSize(), storage);
for( size_t i = 0; i < kpt.size(); i++ )
{
@@ -99,7 +99,7 @@ cvExtractSURF( const CvArr* _img, const CvArr* _mask,
cvSeqPush(*_keypoints, &pt);
}
if( _descriptors )
cvSeqPush(*_descriptors, descr.ptr(i));
cvSeqPush(*_descriptors, descr.ptr((int)i));
}
}