Merge branch '2.4'

2013-02-01 14:58:52 +04:00
parent d874d93e24 b179e2dd2d
commit 61079547f0
44 changed files with 475 additions and 159 deletions
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@@ -1975,6 +1975,14 @@ void cv::transpose( InputArray _src, OutputArray _dst )
    _dst.create(src.cols, src.rows, src.type());
    Mat dst = _dst.getMat();

+    // handle the case of single-column/single-row matrices, stored in STL vectors.
+    if( src.rows != dst.cols || src.cols != dst.rows )
+    {
+        CV_Assert( src.size() == dst.size() && (src.cols == 1 || src.rows == 1) );
+        src.copyTo(dst);
+        return;
+    }
+
    if( dst.data == src.data )
    {
        TransposeInplaceFunc func = transposeInplaceTab[esz];