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

modules/legacy/test/test_em.cpp

@@ -366,7 +366,7 @@ void CV_CvEMTest::run( int /*start_from*/ )
         int currCode = runCase(caseIndex++, params, trainData, trainLabels, testData, testLabels, sizes);
         code = currCode == cvtest::TS::OK ? code : currCode;
     }
-    
+
     ts->set_failed_test_info( code );
 }
 
@@ -382,7 +382,7 @@ protected:
         samples.at<float>(0,0) = 1;
         samples.at<float>(1,0) = 2;
         samples.at<float>(2,0) = 3;
-        
+
         Mat labels(samples.rows, 1, CV_32S);
 
         CvEMParams params;
@@ -398,7 +398,7 @@ protected:
 
         // Write out
 
-        string filename = tempfile() + ".xml";
+        string filename = cv::tempfile(".xml");
         {
             FileStorage fs = FileStorage(filename, FileStorage::WRITE);
             try