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_save_load.cpp
+++ b/modules/ml/test/test_save_load.cpp
@@ -84,7 +84,7 @@ int CV_SLMLTest::validate_test_results( int testCaseIdx )
    // 1. compare files
    ifstream f1( fname1.c_str() ), f2( fname2.c_str() );
    string s1, s2;
-    int lineIdx = 0; 
+    int lineIdx = 0;
    CV_Assert( f1.is_open() && f2.is_open() );
    for( ; !f1.eof() && !f2.eof(); lineIdx++ )
    {