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

All modules (except ocl and gpu) compiles and pass tests

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-20 20:13:46 +04:00
parent 762aefd71b
commit 2ad7b97f1c
91 changed files with 606 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ml/include/opencv2/ml.hpp
View File

@@ -1043,7 +1043,7 @@ public:
CvForestTree* get_tree(int i) const;
protected:
virtual std::string getName() const;
virtual cv::String getName() const;
virtual bool grow_forest( const CvTermCriteria term_crit );
@@ -1115,7 +1115,7 @@ public:
CvRTParams params=CvRTParams());
virtual bool train( CvMLData* data, CvRTParams params=CvRTParams() );
protected:
virtual std::string getName() const;
virtual cv::String getName() const;
virtual bool grow_forest( const CvTermCriteria term_crit );
};
@@ -2072,7 +2072,7 @@ public:
void set_miss_ch( char ch );
char get_miss_ch() const;
const std::map<std::string, int>& get_class_labels_map() const;
const std::map<cv::String, int>& get_class_labels_map() const;
protected:
virtual void clear();
@@ -2101,7 +2101,7 @@ protected:
bool mix;
int total_class_count;
std::map<std::string, int> class_map;
std::map<cv::String, int> class_map;
CvMat* train_sample_idx;
CvMat* test_sample_idx;