diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2017-02-20 13:44:37 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2017-02-20 13:44:37 +0100 |
| commit | 65728257036652fe1cb337a19ee68d8ec01462a3 (patch) | |
| tree | d3396100754698d167842ec743905ad4b99b0d3a /Eigen/src/SVD | |
| parent | a811a0469655f7ad24a01d219c0afe752214255e (diff) | |
bug #1395: fix the use of compile-time vectors as inputs of JacobiSVD.
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 1337ae987..43488b1e0 100644 --- a/Eigen/src/SVD/JacobiSVD.h +++ b/Eigen/src/SVD/JacobiSVD.h @@ -112,9 +112,11 @@ 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, FullPivHouseholderQRPreconditioner>& svd) |