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

fixed a typo error in the default min_Probability param of CreateERFilterNM2

Browse Source
This commit is contained in:
lluis 2013-09-04 20:20:25 +02:00
parent dba336c0e3
commit 765921cc25
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,8 +190,13 @@ CV_EXPORTS Ptr<ERFilter> createERFilterNM1(const Ptr<ERFilter::Callback>& cb = P
if omitted tries to load a default classifier from file trained_classifierNM2.xml
\param minProbability The minimum probability P(er|character) allowed for retreived ER's
*/
<<<<<<< HEAD
CV_EXPORTS Ptr<ERFilter> createERFilterNM2(const Ptr<ERFilter::Callback>& cb = Ptr<ERFilter::Callback>(),
float minProbability = 0.85);
=======
CV_EXPORTS Ptr<ERFilter> createERFilterNM2(const Ptr<ERFilter::Callback>& cb = NULL,
float minProbability = 0.5);
>>>>>>> fixed a typo error in the default min_Probability param of CreateERFilterNM2
}
#endif // _OPENCV_ERFILTER_HPP_