From: Andrey Kamaev <no@email>
Date: Tue, 10 Apr 2012 22:57:01 +0000 (+0000)
Subject: Fixed MSVC warning in Mat::diag
X-Git-Tag: accepted/2.0/20130307.220821~721
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b31f4689211809eeb0d59aec88283ab8e03a3ae3;p=profile%2Fivi%2Fopencv.git

Fixed MSVC warning in Mat::diag
---

diff --git a/modules/core/include/opencv2/core/mat.hpp b/modules/core/include/opencv2/core/mat.hpp
index b68c997..0b72aff 100644
--- 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;
 }