From c636bfcdc0592499f7cbaf41fda4e2d402fb4227 Mon Sep 17 00:00:00 2001
From: Justin Carpentier <justin.carpentier@inria.fr>
Date: Fri, 21 Feb 2020 18:10:26 +0100
Subject: [PATCH] core: move GET_PY_ARRAY_TYPE and rename it
---
include/eigenpy/details.hpp | 2 +-
include/eigenpy/eigen-allocator.hpp | 4 ++--
include/eigenpy/numpy.hpp | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/eigenpy/details.hpp b/include/eigenpy/details.hpp
index 82ec0779..f950ac85 100644
--- a/include/eigenpy/details.hpp
+++ b/include/eigenpy/details.hpp
@@ -139,7 +139,7 @@ namespace eigenpy
if(!PyArray_Check(pyArray))
return 0;
- if(!isScalarConvertible(GET_PY_ARRAY_TYPE(pyArray)))
+ if(!isScalarConvertible(EIGENPY_GET_PY_ARRAY_TYPE(pyArray)))
return 0;
if(MatType::IsVectorAtCompileTime)
diff --git a/include/eigenpy/eigen-allocator.hpp b/include/eigenpy/eigen-allocator.hpp
index dbb6d112..19a32d80 100644
--- a/include/eigenpy/eigen-allocator.hpp
+++ b/include/eigenpy/eigen-allocator.hpp
@@ -97,7 +97,7 @@ namespace eigenpy
Type * mat_ptr = initEigenObject<Type>::run(pyArray,storage);
Type & mat = *mat_ptr;
- const int pyArray_Type = GET_PY_ARRAY_TYPE(pyArray);
+ const int pyArray_Type = EIGENPY_GET_PY_ARRAY_TYPE(pyArray);
if(pyArray_Type == NumpyEquivalentType<Scalar>::type_code)
{
mat = MapNumpy<MatType,Scalar>::map(pyArray); // avoid useless cast
@@ -141,7 +141,7 @@ namespace eigenpy
PyArrayObject * pyArray)
{
const MatrixDerived & mat = const_cast<const MatrixDerived &>(mat_.derived());
- const int pyArray_Type = GET_PY_ARRAY_TYPE(pyArray);
+ const int pyArray_Type = EIGENPY_GET_PY_ARRAY_TYPE(pyArray);
typedef typename MapNumpy<MatType,Scalar>::EigenMap MapType;
diff --git a/include/eigenpy/numpy.hpp b/include/eigenpy/numpy.hpp
index 2c93d7a8..c9cea4ed 100644
--- a/include/eigenpy/numpy.hpp
+++ b/include/eigenpy/numpy.hpp
@@ -18,6 +18,8 @@
#include <numpy/noprefix.h>
+#define EIGENPY_GET_PY_ARRAY_TYPE(array) PyArray_ObjectType(reinterpret_cast<PyObject *>(array), 0)
+
namespace eigenpy
{
void EIGENPY_DLLEXPORT import_numpy();
--
GitLab