added size check to static Mat::diag()

645bb0bf · Vadim Pisarevsky · 25261e6e · 645bb0bf
Commit 645bb0bf authored Aug 10, 2011 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

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

No files found.
--- a/modules/core/include/opencv2/core/mat.hpp
+++ b/modules/core/include/opencv2/core/mat.hpp
@@ -338,6 +338,7 @@ 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();
    d.copyTo(md);
    return m;