Skip to content

Commit e6e1bf6

Browse files
committed
map: fix RowMajor case
1 parent fa69988 commit e6e1bf6

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

include/eigenpy/numpy-map.hpp

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,32 @@ namespace eigenpy
8282
rows = (int)PyArray_DIMS(pyArray)[0];
8383
cols = 1;
8484

85-
inner_stride = (int)PyArray_STRIDE(pyArray, 0) / (int)itemsize;
86-
outer_stride = 0;
85+
if(EquivalentInputMatrixType::IsRowMajor)
86+
{
87+
outer_stride = (int)PyArray_STRIDE(pyArray, 0) / (int)itemsize;
88+
inner_stride = 0;
89+
}
90+
else
91+
{
92+
inner_stride = (int)PyArray_STRIDE(pyArray, 0) / (int)itemsize;
93+
outer_stride = 0;
94+
}
8795
}
8896
else
8997
{
9098
rows = 1;
9199
cols = (int)PyArray_DIMS(pyArray)[0];
92100

93-
inner_stride = 0;
94-
outer_stride = (int)PyArray_STRIDE(pyArray, 0) / (int)itemsize;
101+
if(EquivalentInputMatrixType::IsRowMajor)
102+
{
103+
inner_stride = (int)PyArray_STRIDE(pyArray, 0) / (int)itemsize;
104+
outer_stride = 0;
105+
}
106+
else
107+
{
108+
inner_stride = 0;
109+
outer_stride = (int)PyArray_STRIDE(pyArray, 0) / (int)itemsize;
110+
}
95111
}
96112
}
97113

0 commit comments

Comments
 (0)