core: fix checking of dimensions

jcarpent · jcarpent · commit e1075eda583f · 2018-11-21T14:22:54.000+01:00
diff --git a/include/eigenpy/details.hpp b/include/eigenpy/details.hpp
@@ -265,6 +265,19 @@ namespace eigenpy
         }
       }
       
+      if (PyArray_NDIM(obj_ptr) == 2)
+      {
+        const int R = (int)PyArray_DIMS(obj_ptr)[0];
+        const int C = (int)PyArray_DIMS(obj_ptr)[1];
+        
+        if( (MatType::RowsAtCompileTime!=R)
+           && (MatType::RowsAtCompileTime!=Eigen::Dynamic) )
+          return 0;
+        if( (MatType::ColsAtCompileTime!=C)
+           && (MatType::ColsAtCompileTime!=Eigen::Dynamic) )
+          return 0;
+      }
+      
       // Check if the Scalar type of the obj_ptr is compatible with the Scalar type of MatType
       if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(obj_ptr), 0)) == NPY_INT)
       {

Original file line number	Diff line number	Diff line change
`@@ -265,6 +265,19 @@ namespace eigenpy`
`265`	`265`	`}`
`266`	`266`	`}`
`267`	`267`
	`268`	`+ if (PyArray_NDIM(obj_ptr) == 2)`
	`269`	`+ {`
	`270`	`+ const int R = (int)PyArray_DIMS(obj_ptr)[0];`
	`271`	`+ const int C = (int)PyArray_DIMS(obj_ptr)[1];`
	`272`	`+`
	`273`	`+ if( (MatType::RowsAtCompileTime!=R)`
	`274`	`+ && (MatType::RowsAtCompileTime!=Eigen::Dynamic) )`
	`275`	`+ return 0;`
	`276`	`+ if( (MatType::ColsAtCompileTime!=C)`
	`277`	`+ && (MatType::ColsAtCompileTime!=Eigen::Dynamic) )`
	`278`	`+ return 0;`
	`279`	`+ }`
	`280`	`+`
`268`	`281`	`// Check if the Scalar type of the obj_ptr is compatible with the Scalar type of MatType`
`269`	`282`	`if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(obj_ptr), 0)) == NPY_INT)`
`270`	`283`	`{`