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

changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example.

Browse Source
This commit is contained in:
lluis 2013-09-06 19:10:53 +02:00
parent 6ef1d456dd
commit cd33ca0009
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/objdetect/include/opencv2/objdetect/erfilter.hpp
View File

@ -172,8 +172,8 @@ public:
\param minProbability The minimum probability difference between local maxima and local minima ERs \param minProbability The minimum probability difference between local maxima and local minima ERs
*/ */
CV_EXPORTS Ptr<ERFilter> createERFilterNM1(const Ptr<ERFilter::Callback>& cb = Ptr<ERFilter::Callback>(), CV_EXPORTS Ptr<ERFilter> createERFilterNM1(const Ptr<ERFilter::Callback>& cb = Ptr<ERFilter::Callback>(),
int thresholdDelta = 1, float minArea = 0.000025, int thresholdDelta = 1, float minArea = 0.00025,
float maxArea = 0.13, float minProbability = 0.2, float maxArea = 0.13, float minProbability = 0.4,
bool nonMaxSuppression = true, bool nonMaxSuppression = true,
float minProbabilityDiff = 0.1); float minProbabilityDiff = 0.1);
@ -191,7 +191,7 @@ CV_EXPORTS Ptr<ERFilter> createERFilterNM1(const Ptr<ERFilter::Callback>& cb = P
\param minProbability The minimum probability P(er|character) allowed for retreived ER's \param minProbability The minimum probability P(er|character) allowed for retreived ER's
*/ */
CV_EXPORTS Ptr<ERFilter> createERFilterNM2(const Ptr<ERFilter::Callback>& cb = Ptr<ERFilter::Callback>(), CV_EXPORTS Ptr<ERFilter> createERFilterNM2(const Ptr<ERFilter::Callback>& cb = Ptr<ERFilter::Callback>(),
float minProbability = 0.5); float minProbability = 0.3);
} }
#endif // _OPENCV_ERFILTER_HPP_ #endif // _OPENCV_ERFILTER_HPP_

4
samples/cpp/erfilter.cpp
View File

@ -58,7 +58,7 @@ int main(int argc, const char * argv[])
double t = (double)getTickCount(); double t = (double)getTickCount();
// Build ER tree and filter with the 1st stage default classifier // Build ER tree and filter with the 1st stage default classifier
Ptr<ERFilter> er_filter1 = createERFilterNM1(NULL,1,0.00025,0.13,0.4,true,0.1); Ptr<ERFilter> er_filter1 = createERFilterNM1();
er_filter1->run(grey, regions); er_filter1->run(grey, regions);
@ -89,7 +89,7 @@ int main(int argc, const char * argv[])
t = (double)getTickCount(); t = (double)getTickCount();
// Default second stage classifier // Default second stage classifier
Ptr<ERFilter> er_filter2 = createERFilterNM2(NULL,0.3); Ptr<ERFilter> er_filter2 = createERFilterNM2();
er_filter2->run(grey, regions); er_filter2->run(grey, regions);
t = (double)getTickCount() - t; t = (double)getTickCount() - t;