generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ilya Lysenkov 2012-04-10 13:02:58 +00:00
parent ade6388d3a
commit 829e558d48
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/include/opencv2/core/mat.hpp
View File

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