Fixed MSVC warning in Mat::diag

13 years ago · b31f468921
parent 626afecaf8
commit b31f468921
1 changed files with 2 additions and 1 deletions
--- a/modules/core/include/opencv2/core/mat.hpp
+++ b/modules/core/include/opencv2/core/mat.hpp
@ -320,7 +320,8 @@ inline Mat Mat::colRange(const Range& r) const
 inline Mat Mat::diag(const Mat& d)
 {
    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);
    return m;
 }