opencv-analyze-fix.patch
| b/opencv/modules/core/include/opencv2/core/core.hpp Thu Jan 05 18:15:03 2012 +0100 | ||
|---|---|---|
| 491 | 491 |
Matx<_Tp, m, 1> col(int i) const; |
| 492 | 492 |
|
| 493 | 493 |
//! extract the matrix diagonal |
| 494 |
Matx<_Tp, MIN(m,n), 1> diag() const;
|
|
| 494 |
diag_type diag() const;
|
|
| 495 | 495 |
|
| 496 | 496 |
//! transpose the matrix |
| 497 | 497 |
Matx<_Tp, n, m> t() const; |
| b/opencv/modules/core/include/opencv2/core/operations.hpp Thu Jan 05 18:15:03 2012 +0100 | ||
|---|---|---|
| 355 | 355 | |
| 356 | 356 | |
| 357 | 357 |
template<typename _Tp, int m, int n> inline |
| 358 |
Matx<_Tp,m,n> Matx<_Tp,m,n>::diag(const Matx<_Tp,MIN(m,n),1>& d)
|
|
| 358 |
Matx<_Tp,m,n> Matx<_Tp,m,n>::diag(const typename Matx<_Tp,m,n>::diag_type& d)
|
|
| 359 | 359 |
{
|
| 360 | 360 |
Matx<_Tp,m,n> M; |
| 361 | 361 |
for(int i = 0; i < MIN(m,n); i++) |
| ... | ... | |
| 431 | 431 | |
| 432 | 432 |
|
| 433 | 433 |
template<typename _Tp, int m, int n> inline |
| 434 |
Matx<_Tp, MIN(m,n), 1> Matx<_Tp, m, n>::diag() const
|
|
| 434 |
typename Matx<_Tp, m, n>::diag_type Matx<_Tp, m, n>::diag() const
|
|
| 435 | 435 |
{
|
| 436 | 436 |
diag_type d; |
| 437 | 437 |
for( int i = 0; i < MIN(m, n); i++ ) |