Fixed number of warnings. Fixed mingw64 build.

2012-06-12 14:46:12 +00:00
parent 02e3afae3a
commit c5aba337e9
110 changed files with 2232 additions and 2367 deletions
--- a/modules/legacy/test/test_stereomatching.cpp
+++ b/modules/legacy/test/test_stereomatching.cpp
@@ -593,11 +593,11 @@ int CV_StereoMatchingTest::readDatasetsParams( FileStorage& fs )
    assert(fn.isSeq());
    for( int i = 0; i < (int)fn.size(); i+=3 )
    {
-        string name = fn[i];
+        string nm = fn[i];
        DatasetParams params;
        string sf = fn[i+1]; params.dispScaleFactor = atoi(sf.c_str());
        string uv = fn[i+2]; params.dispUnknVal = atoi(uv.c_str());
-        datasetsParams[name] = params;
+        datasetsParams[nm] = params;
    }
    return cvtest::TS::OK;
 }