Merge pull request #2616 from SpecLad:merge-2.4

2014-04-15 12:06:12 +04:00
parent 8176e893c0 799d2dabd6
commit 534f9623f2
8 changed files with 63 additions and 11 deletions
--- a/modules/core/test/test_arithm.cpp
+++ b/modules/core/test/test_arithm.cpp
@@ -1361,7 +1361,6 @@ TEST_P(ElemWiseTest, accuracy)
        op->op(src, dst, mask);

        double maxErr = op->getMaxErr(depth);
-        vector<int> pos;
        ASSERT_PRED_FORMAT2(cvtest::MatComparator(maxErr, op->context), dst0, dst) << "\nsrc[0] ~ " <<
            cvtest::MatInfo(!src.empty() ? src[0] : Mat()) << "\ntestCase #" << testIdx << "\n";
    }