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

fixed hundreds of warnings from MSVC 2010.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/features2d/src/mser.cpp
View File

@@ -191,8 +191,8 @@ inline void _bitreset(unsigned long * a, unsigned long b)
struct MSERParams
{
MSERParams( int _delta, int _minArea, int _maxArea, float _maxVariation,
float _minDiversity, int _maxEvolution, double _areaThreshold,
MSERParams( int _delta, int _minArea, int _maxArea, double _maxVariation,
double _minDiversity, int _maxEvolution, double _areaThreshold,
double _minMargin, int _edgeBlurSize )
: delta(_delta), minArea(_minArea), maxArea(_maxArea), maxVariation(_maxVariation),
minDiversity(_minDiversity), maxEvolution(_maxEvolution), areaThreshold(_areaThreshold),
@@ -201,8 +201,8 @@ struct MSERParams
int delta;
int minArea;
int maxArea;
float maxVariation;
float minDiversity;
double maxVariation;
double minDiversity;
int maxEvolution;
double areaThreshold;
double minMargin;