fixed Mat::diag (#1939)

13 years ago · 28297c0224
parent 80f1b1478d
commit 28297c0224
1 changed files with 4 additions and 1 deletions
--- a/modules/core/include/opencv2/core/mat.hpp
+++ b/modules/core/include/opencv2/core/mat.hpp
@ -322,7 +322,10 @@ inline Mat Mat::diag(const Mat& d)
    CV_Assert( d.cols == 1 || d.rows == 1 );
    int len = d.rows + d.cols - 1;
    Mat m(len, len, d.type(), Scalar(0)), md = m.diag();
-    d.copyTo(md);
+    if( d.cols == 1 )
+        d.copyTo(md);
+    else
+        transpose(d, md);
    return m;
 }