merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811

2012-06-28 17:07:17 +00:00
parent b156e2f7ed
commit 162f9fd7ea
61 changed files with 2738 additions and 1726 deletions
--- a/modules/ml/test/test_emknearestkmeans.cpp
+++ b/modules/ml/test/test_emknearestkmeans.cpp
@@ -527,7 +527,7 @@ protected:
            firstResult.at<int>(i) = static_cast<int>(em.predict(samples.row(i))[1]);

        // Write out
-        string filename = tempfile() + ".xml";
+        string filename = cv::tempfile(".xml");
        {
            FileStorage fs = FileStorage(filename, FileStorage::WRITE);
            try