mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-03 00:10:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed MSVC warning in Mat::diag

Browse Source
This commit is contained in:
Andrey Kamaev 2012-04-10 22:57:01 +00:00
parent 626afecaf8
commit b31f468921
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,7 +320,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 || d.rows == 1 ); CV_Assert( d.cols == 1 || d.rows == 1 );
Mat m(d.total(), d.total(), d.type(), Scalar(0)), md = m.diag(); int len = d.rows + d.cols - 1;
Mat m(len, len, d.type(), Scalar(0)), md = m.diag();
d.copyTo(md); d.copyTo(md);
return m; return m;
} }