fixed Mat::diag (#1939)

28297c02 · Maria Dimashova · 80f1b147 · 28297c02
Commit 28297c02 authored May 18, 2012 by Maria Dimashova
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

mat.hpp modules/core/include/opencv2/core/mat.hpp +4 -1

No files found.
--- 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;
 }