Merge branch '2.4'

2013-04-05 19:52:42 +04:00
parent 3785439917 74e5ff2ec7
commit 67073daf19
154 changed files with 11355 additions and 16795 deletions
--- a/modules/core/src/matop.cpp
+++ b/modules/core/src/matop.cpp
@@ -324,7 +324,7 @@ void MatOp::augAssignXor(const MatExpr& expr, Mat& m) const
 {
    Mat temp;
    expr.op->assign(expr, temp);
-    m /= temp;
+    m ^= temp;
 }