propagated some more fixes from 2.3 branch to the trunk

2011-06-29 22:06:42 +00:00
parent dacd265424
commit b204e73d9a
54 changed files with 9120 additions and 3049 deletions
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@@ -148,7 +148,7 @@ static void updateContinuityFlag(Mat& m)
            break;
    }
    
-    int64 t = (int64)(m.step[0]/CV_ELEM_SIZE(m.flags))*m.size[0];
+    int64 t = (int64)m.step[0]*m.size[0];
    if( j <= i && t == (int)t )
        m.flags |= Mat::CONTINUOUS_FLAG;
    else