propagated some more fixes from 2.3 branch to the trunk

2011-06-30 12:06:26 +00:00
parent f4894d57cd
commit cc9a1bb62f
32 changed files with 564 additions and 575 deletions
--- a/modules/core/src/copy.cpp
+++ b/modules/core/src/copy.cpp
@@ -171,11 +171,12 @@ void Mat::copyTo( OutputArray _dst ) const
            
            // to handle the copying 1xn matrix => nx1 std vector.
            Size sz = size() == dst.size() ?
-                getContinuousSize(*this, dst, (int)elemSize()) :
-                getContinuousSize(*this, (int)elemSize());
+                getContinuousSize(*this, dst) :
+                getContinuousSize(*this);
+            size_t len = sz.width*elemSize();
            
            for( ; sz.height--; sptr += step, dptr += dst.step )
-                memcpy( dptr, sptr, sz.width );
+                memcpy( dptr, sptr, len );
        }
        return;
    }