projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ade6388
)
Andrey, Maria and I fixed Mat::diag()
author
Ilya Lysenkov
<no@email>
Tue, 10 Apr 2012 13:02:58 +0000
(13:02 +0000)
committer
Ilya Lysenkov
<no@email>
Tue, 10 Apr 2012 13:02:58 +0000
(13:02 +0000)
modules/core/include/opencv2/core/mat.hpp
patch
|
blob
|
history
diff --git
a/modules/core/include/opencv2/core/mat.hpp
b/modules/core/include/opencv2/core/mat.hpp
index
4bd1bb7
..
f2f14fe
100644
(file)
--- a/
modules/core/include/opencv2/core/mat.hpp
+++ b/
modules/core/include/opencv2/core/mat.hpp
@@
-319,8
+319,8
@@
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();
+ CV_Assert( d.cols == 1
|| d.rows == 1
);
+ Mat m(d.
total(), d.total()
, d.type(), Scalar(0)), md = m.diag();
d.copyTo(md);
return m;
}