From df0617161ca32f19b6250c08fa492818ba6b7c56 Mon Sep 17 00:00:00 2001
From: Justin Carpentier <justin.carpentier@inria.fr>
Date: Mon, 24 Feb 2020 22:08:22 +0100
Subject: [PATCH] core: update signature of init_matrix_or_array
---
include/eigenpy/eigen-allocator.hpp | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/include/eigenpy/eigen-allocator.hpp b/include/eigenpy/eigen-allocator.hpp
index a186d828..58f95a5c 100644
--- a/include/eigenpy/eigen-allocator.hpp
+++ b/include/eigenpy/eigen-allocator.hpp
@@ -17,7 +17,7 @@ namespace eigenpy
template<typename MatType, bool IsVectorAtCompileTime = MatType::IsVectorAtCompileTime>
struct init_matrix_or_array
{
- static MatType * run(PyArrayObject * pyArray, void * storage)
+ static MatType * run(PyArrayObject * pyArray, void * storage = NULL)
{
assert(PyArray_NDIM(pyArray) == 1 || PyArray_NDIM(pyArray) == 2);
@@ -33,25 +33,34 @@ namespace eigenpy
cols = 1;
}
- return new (storage) MatType(rows,cols);
+ if(storage)
+ return new (storage) MatType(rows,cols);
+ else
+ return new MatType(rows,cols);
}
};
template<typename MatType>
struct init_matrix_or_array<MatType,true>
{
- static MatType * run(PyArrayObject * pyArray, void * storage)
+ static MatType * run(PyArrayObject * pyArray, void * storage = NULL)
{
if(PyArray_NDIM(pyArray) == 1)
{
const int rows_or_cols = (int)PyArray_DIMS(pyArray)[0];
- return new (storage) MatType(rows_or_cols);
+ if(storage)
+ return new (storage) MatType(rows_or_cols);
+ else
+ return new MatType(rows_or_cols);
}
else
{
const int rows = (int)PyArray_DIMS(pyArray)[0];
const int cols = (int)PyArray_DIMS(pyArray)[1];
- return new (storage) MatType(rows,cols);
+ if(storage)
+ return new (storage) MatType(rows,cols);
+ else
+ return new MatType(rows,cols);
}
}
};
--
GitLab