Remove usage of old Numpy API

Author: mdboom

lib/matplotlib/delaunay/_delaunay.cpp

@@ -6,7 +6,7 @@
 #include "VoronoiDiagramGenerator.h"
 #include "delaunay_utils.h"
 #include "natneighbors.h"
-#include "numpy/noprefix.h"
+#include "numpy/ndarrayobject.h"
 
 // support numpy 1.6 - this macro got renamed and deprecated at once in 1.7
 #ifndef NPY_ARRAY_IN_ARRAY
@@ -123,7 +123,7 @@ static PyObject* getMesh(int npoints, double *x, double *y)
     int tri0, tri1, reg0, reg1;
     double tri0x, tri0y, tri1x, tri1y;
     int length, numtri, i, j;
-    intp dim[MAX_DIMS];
+    npy_intp dim[NPY_MAXDIMS];
     int *edge_db_ptr, *tri_edges_ptr, *tri_nbrs_ptr;
     double *vertices_ptr;
     VoronoiDiagramGenerator vdg;
@@ -221,7 +221,7 @@ static PyObject* getMesh(int npoints, double *x, double *y)
 static PyObject *linear_planes(int ntriangles, double *x, double *y, double *z,
     int *nodes)
 {
-    intp dims[2];
+    npy_intp dims[2];
     PyObject *planes;
     int i;
     double *planes_ptr;
@@ -286,7 +286,7 @@ static PyObject *linear_interpolate_grid(double x0, double x1, int xsteps,
     int rowtri, coltri, tri;
     PyObject *z;
     double *z_ptr;
-    intp dims[2];
+    npy_intp dims[2];
 
     dims[0] = ysteps;
     dims[1] = xsteps;
@@ -596,7 +596,7 @@ static PyObject *nn_interpolate_method(PyObject *self, PyObject *args)
     double x0, x1, y0, y1, defvalue;
     int xsteps, ysteps;
     int npoints, ntriangles;
-    intp dims[2];
+    npy_intp dims[2];
 
     if (!PyArg_ParseTuple(args, "ddiddidOOOOOO", &x0, &x1, &xsteps,
         &y0, &y1, &ysteps, &defvalue, &pyx, &pyy, &pyz, &pycenters, &pynodes,

src/_png.cpp

@@ -249,6 +249,8 @@ static PyObject *_read_png(PyObject *filein, bool float_result)
     png_uint_32 height = 0;
     int bit_depth;
 
+    // TODO: Remove direct calls to Numpy API here
+
     if (PyBytes_Check(filein) || PyUnicode_Check(filein)) {
         if ((py_file = mpl_PyFile_OpenFile(filein, (char *)"rb")) == NULL) {
             goto exit;
@@ -381,18 +383,15 @@ static PyObject *_read_png(PyObject *filein, bool float_result)
         for (png_uint_32 y = 0; y < height; y++) {
             png_byte *row = row_pointers[y];
             for (png_uint_32 x = 0; x < width; x++) {
-                size_t offset = y * A->strides[0] + x * A->strides[1];
                 if (bit_depth == 16) {
                     png_uint_16 *ptr = &reinterpret_cast<png_uint_16 *>(row)[x * dimensions[2]];
                     for (png_uint_32 p = 0; p < (png_uint_32)dimensions[2]; p++) {
-                        *(float *)(A->data + offset + p *A->strides[2]) =
-                            (float)(ptr[p]) / max_value;
+                        *(float *)PyArray_GETPTR3(A, y, x, p) = (float)(ptr[p]) / max_value;
                     }
                 } else {
                     png_byte *ptr = &(row[x * dimensions[2]]);
                     for (png_uint_32 p = 0; p < (png_uint_32)dimensions[2]; p++) {
-                        *(float *)(A->data + offset + p *A->strides[2]) =
-                            (float)(ptr[p]) / max_value;
+                        *(float *)PyArray_GETPTR3(A, y, x, p) = (float)(ptr[p]) / max_value;
                     }
                 }
             }
@@ -414,28 +413,27 @@ static PyObject *_read_png(PyObject *filein, bool float_result)
         for (png_uint_32 y = 0; y < height; y++) {
             png_byte *row = row_pointers[y];
             for (png_uint_32 x = 0; x < width; x++) {
-                size_t offset = y * A->strides[0] + x * A->strides[1];
                 if (bit_depth == 16) {
                     png_uint_16 *ptr = &reinterpret_cast<png_uint_16 *>(row)[x * dimensions[2]];
 
                     if (bit_depth == 16) {
                         for (png_uint_32 p = 0; p < (png_uint_32)dimensions[2]; p++) {
-                            *(png_uint_16 *)(A->data + offset + p *A->strides[2]) = ptr[p];
+                            *(png_uint_16 *)PyArray_GETPTR3(A, y, x, p) = ptr[p];
                         }
                     } else {
                         for (png_uint_32 p = 0; p < (png_uint_32)dimensions[2]; p++) {
-                            *(png_byte *)(A->data + offset + p *A->strides[2]) = ptr[p] >> 8;
+                            *(png_byte *)PyArray_GETPTR3(A, y, x, p) = ptr[p] >> 8;
                         }
                     }
                 } else {
                     png_byte *ptr = &(row[x * dimensions[2]]);
                     if (bit_depth == 16) {
                         for (png_uint_32 p = 0; p < (png_uint_32)dimensions[2]; p++) {
-                            *(png_uint_16 *)(A->data + offset + p *A->strides[2]) = ptr[p];
+                            *(png_uint_16 *)PyArray_GETPTR3(A, y, x, p) = ptr[p];
                         }
                     } else {
                         for (png_uint_32 p = 0; p < (png_uint_32)dimensions[2]; p++) {
-                            *(png_byte *)(A->data + offset + p *A->strides[2]) = ptr[p];
+                            *(png_byte *)PyArray_GETPTR3(A, y, x, p) = ptr[p];
                         }
                     }
                 }

src/ft2font_wrapper.cpp

@@ -139,7 +139,7 @@ const char *PyFT2Image_as_array__doc__ =
 static PyObject *PyFT2Image_as_array(PyFT2Image *self, PyObject *args, PyObject *kwds)
 {
     npy_intp dims[] = {(npy_intp)self->x->get_height(), (npy_intp)self->x->get_width() };
-    return PyArray_SimpleNewFromData(2, dims, PyArray_UBYTE, self->x->get_buffer());
+    return PyArray_SimpleNewFromData(2, dims, NPY_UBYTE, self->x->get_buffer());
 }
 
 static PyObject *PyFT2Image_get_width(PyFT2Image *self, PyObject *args, PyObject *kwds)

src/py_adaptors.h

@@ -104,7 +104,7 @@ class PathIterator
         m_simplify_threshold = simplify_threshold;
 
         Py_XDECREF(m_vertices);
-        m_vertices = (PyArrayObject *)PyArray_FromObject(vertices, PyArray_DOUBLE, 2, 2);
+        m_vertices = (PyArrayObject *)PyArray_FromObject(vertices, NPY_DOUBLE, 2, 2);
 
         if (!m_vertices || PyArray_DIM(m_vertices, 1) != 2) {
             PyErr_SetString(PyExc_ValueError, "Invalid vertices array");
@@ -115,7 +115,7 @@ class PathIterator
         m_codes = NULL;
 
         if (codes != NULL && codes != Py_None) {
-            m_codes = (PyArrayObject *)PyArray_FromObject(codes, PyArray_UINT8, 1, 1);
+            m_codes = (PyArrayObject *)PyArray_FromObject(codes, NPY_UINT8, 1, 1);
 
             if (!m_codes || PyArray_DIM(m_codes, 0) != PyArray_DIM(m_vertices, 0)) {
                 PyErr_SetString(PyExc_ValueError, "Invalid codes array");