Skip to content

O
opencv
Commit 1af9b8ec authored by Andrey Kamaev's avatar Andrey Kamaev
Browse files
Options

Applied patch from #1133

parent 77425edd
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/core/include/opencv2/core/core.hpp
View file @ 1af9b8ec
...@@ -492,7 +492,7 @@ public: ...@@ -492,7 +492,7 @@ public:
Matx<_Tp, m, 1> col(int i) const; Matx<_Tp, m, 1> col(int i) const;
//! extract the matrix diagonal //! extract the matrix diagonal
Matx<_Tp, MIN(m,n), 1> diag() const; diag_type diag() const;
//! transpose the matrix //! transpose the matrix
Matx<_Tp, n, m> t() const; Matx<_Tp, n, m> t() const;
......
modules/core/include/opencv2/core/operations.hpp
View file @ 1af9b8ec
...@@ -360,7 +360,7 @@ template<typename _Tp, int m, int n> inline double Matx<_Tp, m, n>::ddot(const M ...@@ -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 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; Matx<_Tp,m,n> M;
for(int i = 0; i < MIN(m,n); i++) 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 ...@@ -436,7 +436,7 @@ Matx<_Tp, m, 1> Matx<_Tp, m, n>::col(int j) const
template<typename _Tp, int m, int n> inline 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; diag_type d;
for( int i = 0; i < MIN(m, n); i++ ) for( int i = 0; i < MIN(m, n); i++ )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment