fixed #2297, #2300; fixed several warnings

2012-08-28 13:45:35 +04:00
parent 95d54196db
commit 0bd68a70f1
12 changed files with 27 additions and 22 deletions
--- a/modules/core/src/array.cpp
+++ b/modules/core/src/array.cpp
@@ -861,7 +861,7 @@ cvCreateData( CvArr* arr )
        if( CV_IS_MAT_CONT( mat->type ))
        {
            total_size = (size_t)mat->dim[0].size*(mat->dim[0].step != 0 ?
-                         mat->dim[0].step : total_size);
+                         (size_t)mat->dim[0].step : total_size);
        }
        else
        {