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

fixed rebase conflicts

Browse Source
This commit is contained in:
lluis
2013-09-06 14:00:11 +02:00
parent 512111af9c
commit 6ef1d456dd
2 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,13 +190,8 @@ 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_