Merge remote-tracking branch 'origin/master'

2012-09-17 16:12:36 +04:00
parent 7946fcdb69 e73089bdb5
commit 37f4ea6be7
19 changed files with 672 additions and 530 deletions
--- a/modules/core/test/test_operations.cpp
+++ b/modules/core/test/test_operations.cpp
@@ -774,7 +774,7 @@ bool CV_OperationsTest::TestTemplateMat()
            Mat m2 = Mat::zeros(10, 10, CV_8UC3);
            m1.copyTo(m2.row(1));
        }
-        catch(const Exception& e)
+        catch(const Exception&)
        {
            badarg_catched = true;
        }