From b64a09acc109489f0b14c20de11493c26cc74d92 Mon Sep 17 00:00:00 2001 From: yoco Date: Tue, 4 Feb 2014 05:54:50 +0800 Subject: [PATCH] fix reshape's Max[Row/Col]AtCompileTime --- Eigen/src/Core/Reshape.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Eigen/src/Core/Reshape.h b/Eigen/src/Core/Reshape.h index 9666e6b9c..e82136bd4 100644 --- a/Eigen/src/Core/Reshape.h +++ b/Eigen/src/Core/Reshape.h @@ -61,11 +61,9 @@ struct traits > : traits RowsAtCompileTime = MatrixRows == 0 ? 0 : ReshapeRows, ColsAtCompileTime = MatrixCols == 0 ? 0 : ReshapeCols, MaxRowsAtCompileTime = ReshapeRows==0 ? 0 - : RowsAtCompileTime != Dynamic ? int(RowsAtCompileTime) - : int(traits::MaxRowsAtCompileTime), + : int(RowsAtCompileTime), MaxColsAtCompileTime = ReshapeCols==0 ? 0 - : ColsAtCompileTime != Dynamic ? int(ColsAtCompileTime) - : int(traits::MaxColsAtCompileTime), + : int(ColsAtCompileTime), XprTypeIsRowMajor = (int(traits::Flags)&RowMajorBit) != 0, IsRowMajor = (MaxRowsAtCompileTime==1&&MaxColsAtCompileTime!=1) ? 1 : (MaxColsAtCompileTime==1&&MaxRowsAtCompileTime!=1) ? 0