Andrey, Maria and I fixed Mat::diag()

829e558d · Ilya Lysenkov · ade6388d · 829e558d
Commit 829e558d authored Apr 10, 2012 by Ilya Lysenkov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mat.hpp modules/core/include/opencv2/core/mat.hpp +2 -2

No files found.
--- a/modules/core/include/opencv2/core/mat.hpp
+++ b/modules/core/include/opencv2/core/mat.hpp
@@ -319,8 +319,8 @@ inline Mat Mat::colRange(const Range& r) const

 inline Mat Mat::diag(const Mat& d)
 {
-    CV_Assert( d.cols == 1 );
-    Mat m(d.rows, d.rows, d.type(), Scalar(0)), md = m.diag();
+    CV_Assert( d.cols == 1 || d.rows == 1 );
+    Mat m(d.total(), d.total(), d.type(), Scalar(0)), md = m.diag();
    d.copyTo(md);
    return m;
 }