generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied patch from #1133

Browse Source
This commit is contained in:
Andrey Kamaev 2012-03-30 06:19:21 +00:00
parent 77425edd11
commit 1af9b8ecab
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/core.hpp
View File

@ -492,7 +492,7 @@ public:
Matx<_Tp, m, 1> col(int i) const;
//! extract the matrix diagonal
Matx<_Tp, MIN(m,n), 1> diag() const;
diag_type diag() const;
//! transpose the matrix
Matx<_Tp, n, m> t() const;

4
modules/core/include/opencv2/core/operations.hpp
View File

@ -360,7 +360,7 @@ template<typename _Tp, int m, int n> inline double Matx<_Tp, m, n>::ddot(const M
template<typename _Tp, int m, int n> inline
Matx<_Tp,m,n> Matx<_Tp,m,n>::diag(const Matx<_Tp,MIN(m,n),1>& d)
Matx<_Tp,m,n> Matx<_Tp,m,n>::diag(const typename Matx<_Tp,m,n>::diag_type& d)
{
Matx<_Tp,m,n> M;
for(int i = 0; i < MIN(m,n); i++)
@ -436,7 +436,7 @@ Matx<_Tp, m, 1> Matx<_Tp, m, n>::col(int j) const
template<typename _Tp, int m, int n> inline
Matx<_Tp, MIN(m,n), 1> Matx<_Tp, m, n>::diag() const
typename Matx<_Tp, m, n>::diag_type Matx<_Tp, m, n>::diag() const
{
diag_type d;
for( int i = 0; i < MIN(m, n); i++ )