use dtype's fields PyObject* now

PDAL · Jun 17, 2024 · 7c18e18 · 7c18e18
1 parent c03f987
commit 7c18e18
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/pdal/PyArray.cpp b/src/pdal/PyArray.cpp
@@ -97,9 +97,11 @@ Array::Array(PyArrayObject* array) : m_array(array), m_rowMajor(true)
     PyArray_Descr *dtype = PyArray_DTYPE(m_array);
     npy_intp ndims = PyArray_NDIM(m_array);
     npy_intp *shape = PyArray_SHAPE(m_array);
-    int numFields = (dtype->fields == Py_None) ?
+
+    PyObject* fields = PyDataType_FIELDS(dtype);
+    int numFields = (fields  == Py_None) ?
         0 :
-        static_cast<int>(PyDict_Size(dtype->fields));
+        static_cast<int>(PyDict_Size(fields));
 
     int xyz = 0;
     if (numFields == 0)
@@ -110,7 +112,7 @@ Array::Array(PyArrayObject* array) : m_array(array), m_rowMajor(true)
     }
     else
     {
-        PyObject *names_dict = dtype->fields;
+        PyObject *names_dict = fields;
         PyObject *names = PyDict_Keys(names_dict);
         PyObject *values = PyDict_Values(names_dict);
         if (!names || !values)

diff --git a/src/pdal/__main__.py b/src/pdal/__main__.py
@@ -48,7 +48,10 @@ def print_version(args):
 
     line = '----------------------------------------------------------------------------------------------------------------------------\n'
     version = f'PDAL version {pdal_version}\nPython bindings version {__version__}\n'
-    plugin = f"Environment-set PDAL_DRIVER_PATH: {os.environ['PDAL_DRIVER_PATH']}"
+    driver_path = 'PDAL_DRIVER_PATH not set!'
+    if 'PDAL_DRIVER_PATH' in os.environ:
+        driver_path = os.environ['PDAL_DRIVER_PATH']
+    plugin = f"Environment-set PDAL_DRIVER_PATH: {driver_path}"
     output = f'{line}{version}{plugin}\n{line}\n{debug}'
     print (output)