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

quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-10-18 20:44:26 +04:00
parent 22ff1e8826
commit d2b9dc5530
29 changed files with 278 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,35 +86,17 @@ public:
virtual ~MSER_Impl() {}
void set(int propId, double value)
{
if( propId == DELTA )
params.delta = cvRound(value);
else if( propId == MIN_AREA )
params.minArea = cvRound(value);
else if( propId == MAX_AREA )
params.maxArea = cvRound(value);
else if( propId == PASS2_ONLY )
params.pass2Only = value != 0;
else
CV_Error(CV_StsBadArg, "Unknown parameter id");
}
void setDelta(int delta) { params.delta = delta; }
int getDelta() const { return params.delta; }
double get(int propId) const
{
double value = 0;
if( propId == DELTA )
value = params.delta;
else if( propId == MIN_AREA )
value = params.minArea;
else if( propId == MAX_AREA )
value = params.maxArea;
else if( propId == PASS2_ONLY )
value = params.pass2Only;
else
CV_Error(CV_StsBadArg, "Unknown parameter id");
return value;
}
void setMinArea(int minArea) { params.minArea = minArea; }
int getMinArea() const { return params.minArea; }
void setMaxArea(int maxArea) { params.maxArea = maxArea; }
int getMaxArea() const { return params.maxArea; }
void setPass2Only(bool f) { params.pass2Only = f; }
bool getPass2Only() const { return params.pass2Only; }
enum { DIR_SHIFT = 29, NEXT_MASK = ((1<<DIR_SHIFT)-1) };