Merged the trunk r8589:8653 - all changes related to build warnings

2012-06-15 13:04:17 +00:00
parent 73c152abc4
commit bd0e0b5800
438 changed files with 20374 additions and 19674 deletions
--- a/modules/core/test/test_arithm.cpp
+++ b/modules/core/test/test_arithm.cpp
@@ -1264,7 +1264,7 @@ struct NormOp : public BaseElemWiseOp
        dst.at<double>(0,0) = cvtest::norm(src[0], normType, mask);
        dst.at<double>(0,1) = cvtest::norm(src[0], src[1], normType, mask);
    }
-    void generateScalars(int, RNG& rng)
+    void generateScalars(int, RNG& /*rng*/)
    {
    }
    double getMaxErr(int)