diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-05-18 08:24:06 -0400 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-05-18 08:24:06 -0400 |
| commit | 1c04484a01cffeff2112440718c20339da148a2d (patch) | |
| tree | 6cf66d8bc4c24acc64c90e49436b65280c6b5648 /Eigen/src/Core/Block.h | |
| parent | 5250c4395c1a3546f811f7322f90f9dc954f3fdd (diff) | |
bug fix, since the last storage order changes, this InnerSize calculation was wrong
Diffstat (limited to 'Eigen/src/Core/Block.h')
| -rw-r--r-- | Eigen/src/Core/Block.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Eigen/src/Core/Block.h b/Eigen/src/Core/Block.h index dd07142c6..79c9dd421 100644 --- a/Eigen/src/Core/Block.h +++ b/Eigen/src/Core/Block.h @@ -81,8 +81,7 @@ struct ei_traits<Block<XprType, BlockRows, BlockCols, HasDirectAccess> > : ei_tr : (MaxColsAtCompileTime==1&&MaxRowsAtCompileTime!=1) ? 0 : XprTypeIsRowMajor, HasSameStorageOrderAsXprType = (IsRowMajor == XprTypeIsRowMajor), - InnerSize = XprTypeIsRowMajor // notice how it's XprTypeIsRowMajor here, not IsRowMajor. Inner size is computed wrt the host matrix's storage order. - ? int(ColsAtCompileTime) : int(RowsAtCompileTime), + InnerSize = IsRowMajor ? int(ColsAtCompileTime) : int(RowsAtCompileTime), InnerStrideAtCompileTime = HasSameStorageOrderAsXprType ? int(ei_inner_stride_at_compile_time<XprType>::ret) : int(ei_outer_stride_at_compile_time<XprType>::ret), |