diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2017-01-31 16:22:54 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2017-01-31 16:22:54 +0100 |
| commit | 645a8e32a556f2dff312c7c31d3622709d4960ad (patch) | |
| tree | 27a97773c84dc9e2171b000c1abcbcb10170d8e2 /Eigen/src/SVD | |
| parent | 53026d29d41e81065b28631445e8eb5c4044c187 (diff) | |
Fix compilation of JacobiSVD for vectors type
Diffstat (limited to 'Eigen/src/SVD')
| -rw-r--r-- | Eigen/src/SVD/JacobiSVD.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Eigen/src/SVD/JacobiSVD.h b/Eigen/src/SVD/JacobiSVD.h index e0cfb6283..1337ae987 100644 --- a/Eigen/src/SVD/JacobiSVD.h +++ b/Eigen/src/SVD/JacobiSVD.h @@ -200,10 +200,12 @@ public: ColsAtCompileTime = MatrixType::ColsAtCompileTime, MaxRowsAtCompileTime = MatrixType::MaxRowsAtCompileTime, MaxColsAtCompileTime = MatrixType::MaxColsAtCompileTime, - Options = MatrixType::Options + TrOptions = RowsAtCompileTime==1 ? (MatrixType::Options & ~(RowMajor)) + : ColsAtCompileTime==1 ? (MatrixType::Options | RowMajor) + : MatrixType::Options }; - typedef Matrix<Scalar, ColsAtCompileTime, RowsAtCompileTime, Options, MaxColsAtCompileTime, MaxRowsAtCompileTime> + typedef Matrix<Scalar, ColsAtCompileTime, RowsAtCompileTime, TrOptions, MaxColsAtCompileTime, MaxRowsAtCompileTime> TransposeTypeWithSameStorageOrder; void allocate(const JacobiSVD<MatrixType, ColPivHouseholderQRPreconditioner>& svd) |