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

renamed getDefaultClassifierNM{1,2}() to loadClassifierNM{1,2}() and added "const std::string& filename" parameter (mandatory).

Browse Source
This commit is contained in:
lluis
2013-09-13 16:19:52 +02:00
parent 95d92c099c
commit 75fdfba281
2 changed files with 34 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,7 @@
#include "opencv2/core.hpp"
#include <vector>
#include <deque>
#include <string>
namespace cv
{
@@ -164,7 +165,7 @@ public:
\param cb Callback with the classifier.
if omitted tries to load a default classifier from file trained_classifierNM1.xml
default classifier can be implicitly load with function getDefaultClassifierNM1()
default classifier can be implicitly load with function loadClassifierNM1()
\param thresholdDelta Threshold step in subsequent thresholds when extracting the component tree
\param minArea The minimum area (% of image size) allowed for retreived ER's
\param minArea The maximum area (% of image size) allowed for retreived ER's
@@ -189,7 +190,7 @@ CV_EXPORTS Ptr<ERFilter> createERFilterNM1(const Ptr<ERFilter::Callback>& cb = P
\param cb Callback with the classifier
if omitted tries to load a default classifier from file trained_classifierNM2.xml
default classifier can be implicitly load with function getDefaultClassifierNM2()
default classifier can be implicitly load with function loadClassifierNM2()
\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>(),
@@ -198,21 +199,19 @@ CV_EXPORTS Ptr<ERFilter> createERFilterNM2(const Ptr<ERFilter::Callback>& cb = P
/*!
Allow to implicitly load the default classifier when creating an ERFilter object.
The function takes no parameters and returns a pointer to ERFilter::Callback.
The dafault classifier is loaded from file trained_classifierNM1.xml
if it's found in current directory.
The function takes as parameter the XML or YAML file with the classifier model
(e.g. trained_classifierNM1.xml) returns a pointer to ERFilter::Callback.
*/
CV_EXPORTS Ptr<ERFilter::Callback> getDefaultClassifierNM1();
CV_EXPORTS Ptr<ERFilter::Callback> loadClassifierNM1(const std::string& filename);
/*!
Allow to implicitly load the default classifier when creating an ERFilter object.
The function takes no parameters and returns a pointer to ERFilter::Callback.
The dafault classifier is loaded from file trained_classifierNM2.xml
if it's found in current directory.
The function takes as parameter the XML or YAML file with the classifier model
(e.g. trained_classifierNM1.xml) returns a pointer to ERFilter::Callback.
*/
CV_EXPORTS Ptr<ERFilter::Callback> getDefaultClassifierNM2();
CV_EXPORTS Ptr<ERFilter::Callback> loadClassifierNM2(const std::string& filename);
// computeNMChannels operation modes