Merge branch 2.4

2012-12-24 17:10:07 +04:00
parent 2128bd25e4 014a500f79
commit 13b6a3a15e
20 changed files with 67 additions and 40 deletions
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@@ -1186,6 +1186,24 @@ Size _InputArray::size(int i) const

 size_t _InputArray::total(int i) const
 {
+    int k = kind();
+
+    if( k == MAT )
+    {
+        CV_Assert( i < 0 );
+        return ((const Mat*)obj)->total();
+    }
+
+    if( k == STD_VECTOR_MAT )
+    {
+        const vector<Mat>& vv = *(const vector<Mat>*)obj;
+        if( i < 0 )
+            return vv.size();
+
+        CV_Assert( i < (int)vv.size() );
+        return vv[i].total();
+    }
+
    return size(i).area();
 }