diff options
author | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-05-30 16:00:58 -0400 |
---|---|---|
committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-05-30 16:00:58 -0400 |
commit | aaaade4b3d66d67d2c08af3372c3965e7255b2e8 (patch) | |
tree | 76dfaefb014333b2f98c6db660454771655ea8b7 /Eigen/src/misc/Image.h | |
parent | faa3ff3be6a02b57c6cb05edc87375e54ab96606 (diff) |
the Index types change.
As discussed on the list (too long to explain here).
Diffstat (limited to 'Eigen/src/misc/Image.h')
-rw-r--r-- | Eigen/src/misc/Image.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Eigen/src/misc/Image.h b/Eigen/src/misc/Image.h index 1d63d8143..32392fd29 100644 --- a/Eigen/src/misc/Image.h +++ b/Eigen/src/misc/Image.h @@ -48,6 +48,8 @@ template<typename _DecompositionType> struct ei_image_retval_base { typedef _DecompositionType DecompositionType; typedef typename DecompositionType::MatrixType MatrixType; + typedef ReturnByValue<ei_image_retval_base> Base; + typedef typename Base::Index Index; ei_image_retval_base(const DecompositionType& dec, const MatrixType& originalMatrix) : m_dec(dec), m_rank(dec.rank()), @@ -55,9 +57,9 @@ template<typename _DecompositionType> struct ei_image_retval_base m_originalMatrix(originalMatrix) {} - inline int rows() const { return m_dec.rows(); } - inline int cols() const { return m_cols; } - inline int rank() const { return m_rank; } + inline Index rows() const { return m_dec.rows(); } + inline Index cols() const { return m_cols; } + inline Index rank() const { return m_rank; } inline const DecompositionType& dec() const { return m_dec; } inline const MatrixType& originalMatrix() const { return m_originalMatrix; } @@ -68,7 +70,7 @@ template<typename _DecompositionType> struct ei_image_retval_base protected: const DecompositionType& m_dec; - int m_rank, m_cols; + Index m_rank, m_cols; const MatrixType& m_originalMatrix; }; @@ -76,6 +78,7 @@ template<typename _DecompositionType> struct ei_image_retval_base typedef typename DecompositionType::MatrixType MatrixType; \ typedef typename MatrixType::Scalar Scalar; \ typedef typename MatrixType::RealScalar RealScalar; \ + typedef typename MatrixType::Index Index; \ typedef ei_image_retval_base<DecompositionType> Base; \ using Base::dec; \ using Base::originalMatrix; \ |