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

2013-03-20 20:13:46 +04:00
parent 762aefd71b
commit 2ad7b97f1c
91 changed files with 606 additions and 604 deletions
--- a/modules/ml/src/data.cpp
+++ b/modules/ml/src/data.cpp
@@ -285,7 +285,7 @@ const CvMat* CvMLData::get_missing() const
    return missing;
 }

-const std::map<std::string, int>& CvMLData::get_class_labels_map() const
+const std::map<cv::String, int>& CvMLData::get_class_labels_map() const
 {
    return class_map;
 }