Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit fdb9b31

Browse files
jkseppanjkseppan
committed
Replace old numpy macros with their new versions
Using the replace_old_macros.sed script distributed with numpy.
1 parent 04496b0 commit fdb9b31

File tree

11 files changed

+108
-108
lines changed

11 files changed

+108
-108
lines changed

‎lib/matplotlib/delaunay/_delaunay.cpp

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -135,21 +135,21 @@ static PyObject* getMesh(int npoints, double *x, double *y)
135135

136136
dim[0] = length;
137137
dim[1] = 2;
138-
edge_db = PyArray_SimpleNew(2, dim, PyArray_INT);
138+
edge_db = PyArray_SimpleNew(2, dim, NPY_INT);
139139
if (!edge_db) goto fail;
140140
edge_db_ptr = (int*)PyArray_DATA(edge_db);
141141

142142
dim[0] = numtri;
143-
vertices = PyArray_SimpleNew(2, dim, PyArray_DOUBLE);
143+
vertices = PyArray_SimpleNew(2, dim, NPY_DOUBLE);
144144
if (!vertices) goto fail;
145145
vertices_ptr = (double*)PyArray_DATA(vertices);
146146

147147
dim[1] = 3;
148-
tri_edges = PyArray_SimpleNew(2, dim, PyArray_INT);
148+
tri_edges = PyArray_SimpleNew(2, dim, NPY_INT);
149149
if (!tri_edges) goto fail;
150150
tri_edges_ptr = (int*)PyArray_DATA(tri_edges);
151151

152-
tri_nbrs = PyArray_SimpleNew(2, dim, PyArray_INT);
152+
tri_nbrs = PyArray_SimpleNew(2, dim, NPY_INT);
153153
if (!tri_nbrs) goto fail;
154154
tri_nbrs_ptr = (int*)PyArray_DATA(tri_nbrs);
155155

@@ -224,7 +224,7 @@ static PyObject *linear_planes(int ntriangles, double *x, double *y, double *z,
224224

225225
dims[0] = ntriangles;
226226
dims[1] = 3;
227-
planes = PyArray_SimpleNew(2, dims, PyArray_DOUBLE);
227+
planes = PyArray_SimpleNew(2, dims, NPY_DOUBLE);
228228
if (!planes) return NULL;
229229
planes_ptr = (double *)PyArray_DATA(planes);
230230

@@ -285,7 +285,7 @@ static PyObject *linear_interpolate_grid(double x0, double x1, int xsteps,
285285

286286
dims[0] = ysteps;
287287
dims[1] = xsteps;
288-
z = PyArray_SimpleNew(2, dims, PyArray_DOUBLE);
288+
z = PyArray_SimpleNew(2, dims, NPY_DOUBLE);
289289
if (!z) return NULL;
290290
z_ptr = (double*)PyArray_DATA(z);
291291

@@ -320,17 +320,17 @@ static PyObject *compute_planes_method(PyObject *self, PyObject *args)
320320
if (!PyArg_ParseTuple(args, "OOOO", &pyx, &pyy, &pyz, &pynodes)) {
321321
return NULL;
322322
}
323-
x = PyArray_FROMANY(pyx, PyArray_DOUBLE, 1, 1, NPY_IN_ARRAY);
323+
x = PyArray_FROMANY(pyx, NPY_DOUBLE, 1, 1, NPY_IN_ARRAY);
324324
if (!x) {
325325
PyErr_SetString(PyExc_ValueError, "x must be a 1-D array of floats");
326326
goto fail;
327327
}
328-
y = PyArray_FROMANY(pyy, PyArray_DOUBLE, 1, 1, NPY_IN_ARRAY);
328+
y = PyArray_FROMANY(pyy, NPY_DOUBLE, 1, 1, NPY_IN_ARRAY);
329329
if (!y) {
330330
PyErr_SetString(PyExc_ValueError, "y must be a 1-D array of floats");
331331
goto fail;
332332
}
333-
z = PyArray_FROMANY(pyz, PyArray_DOUBLE, 1, 1, NPY_IN_ARRAY);
333+
z = PyArray_FROMANY(pyz, NPY_DOUBLE, 1, 1, NPY_IN_ARRAY);
334334
if (!z) {
335335
PyErr_SetString(PyExc_ValueError, "z must be a 1-D array of floats");
336336
goto fail;
@@ -340,7 +340,7 @@ static PyObject *compute_planes_method(PyObject *self, PyObject *args)
340340
PyErr_SetString(PyExc_ValueError, "x,y,z arrays must be of equal length");
341341
goto fail;
342342
}
343-
nodes = PyArray_FROMANY(pynodes, PyArray_INT, 2, 2, NPY_IN_ARRAY);
343+
nodes = PyArray_FROMANY(pynodes, NPY_INT, 2, 2, NPY_IN_ARRAY);
344344
if (!nodes) {
345345
PyErr_SetString(PyExc_ValueError, "nodes must be a 2-D array of ints");
346346
goto fail;
@@ -382,12 +382,12 @@ static PyObject *linear_interpolate_method(PyObject *self, PyObject *args)
382382
&defvalue, &pyplanes, &pyx, &pyy, &pynodes, &pyneighbors)) {
383383
return NULL;
384384
}
385-
x = PyArray_FROMANY(pyx, PyArray_DOUBLE, 1, 1, NPY_IN_ARRAY);
385+
x = PyArray_FROMANY(pyx, NPY_DOUBLE, 1, 1, NPY_IN_ARRAY);
386386
if (!x) {
387387
PyErr_SetString(PyExc_ValueError, "x must be a 1-D array of floats");
388388
goto fail;
389389
}
390-
y = PyArray_FROMANY(pyy, PyArray_DOUBLE, 1, 1, NPY_IN_ARRAY);
390+
y = PyArray_FROMANY(pyy, NPY_DOUBLE, 1, 1, NPY_IN_ARRAY);
391391
if (!y) {
392392
PyErr_SetString(PyExc_ValueError, "y must be a 1-D array of floats");
393393
goto fail;
@@ -397,17 +397,17 @@ static PyObject *linear_interpolate_method(PyObject *self, PyObject *args)
397397
PyErr_SetString(PyExc_ValueError, "x,y arrays must be of equal length");
398398
goto fail;
399399
}
400-
planes = PyArray_FROMANY(pyplanes, PyArray_DOUBLE, 2, 2, NPY_IN_ARRAY);
400+
planes = PyArray_FROMANY(pyplanes, NPY_DOUBLE, 2, 2, NPY_IN_ARRAY);
401401
if (!planes) {
402402
PyErr_SetString(PyExc_ValueError, "planes must be a 2-D array of floats");
403403
goto fail;
404404
}
405-
nodes = PyArray_FROMANY(pynodes, PyArray_INT, 2, 2, NPY_IN_ARRAY);
405+
nodes = PyArray_FROMANY(pynodes, NPY_INT, 2, 2, NPY_IN_ARRAY);
406406
if (!nodes) {
407407
PyErr_SetString(PyExc_ValueError, "nodes must be a 2-D array of ints");
408408
goto fail;
409409
}
410-
neighbors = PyArray_FROMANY(pyneighbors, PyArray_INT, 2, 2, NPY_IN_ARRAY);
410+
neighbors = PyArray_FROMANY(pyneighbors, NPY_INT, 2, 2, NPY_IN_ARRAY);
411411
if (!neighbors) {
412412
PyErr_SetString(PyExc_ValueError, "neighbors must be a 2-D array of ints");
413413
goto fail;
@@ -463,19 +463,19 @@ static PyObject *nn_interpolate_unstructured_method(PyObject *self, PyObject *ar
463463
&pyx, &pyy, &pyz, &pycenters, &pynodes, &pyneighbors)) {
464464
return NULL;
465465
}
466-
x = PyArray_FROMANY(pyx, PyArray_DOUBLE, 1, 1, NPY_IN_ARRAY);
466+
x = PyArray_FROMANY(pyx, NPY_DOUBLE, 1, 1, NPY_IN_ARRAY);
467467
if (!x) {
468468
PyErr_SetString(PyExc_ValueError, "x must be a 1-D array of floats");
469469
CLEANUP
470470
return NULL;
471471
}
472-
y = PyArray_FROMANY(pyy, PyArray_DOUBLE, 1, 1, NPY_IN_ARRAY);
472+
y = PyArray_FROMANY(pyy, NPY_DOUBLE, 1, 1, NPY_IN_ARRAY);
473473
if (!y) {
474474
PyErr_SetString(PyExc_ValueError, "y must be a 1-D array of floats");
475475
CLEANUP
476476
return NULL;
477477
}
478-
z = PyArray_FROMANY(pyz, PyArray_DOUBLE, 1, 1, NPY_IN_ARRAY);
478+
z = PyArray_FROMANY(pyz, NPY_DOUBLE, 1, 1, NPY_IN_ARRAY);
479479
if (!z) {
480480
PyErr_SetString(PyExc_ValueError, "z must be a 1-D array of floats");
481481
CLEANUP
@@ -487,19 +487,19 @@ static PyObject *nn_interpolate_unstructured_method(PyObject *self, PyObject *ar
487487
CLEANUP
488488
return NULL;
489489
}
490-
centers = PyArray_FROMANY(pycenters, PyArray_DOUBLE, 2, 2, NPY_IN_ARRAY);
490+
centers = PyArray_FROMANY(pycenters, NPY_DOUBLE, 2, 2, NPY_IN_ARRAY);
491491
if (!centers) {
492492
PyErr_SetString(PyExc_ValueError, "centers must be a 2-D array of ints");
493493
CLEANUP
494494
return NULL;
495495
}
496-
nodes = PyArray_FROMANY(pynodes, PyArray_INT, 2, 2, NPY_IN_ARRAY);
496+
nodes = PyArray_FROMANY(pynodes, NPY_INT, 2, 2, NPY_IN_ARRAY);
497497
if (!nodes) {
498498
PyErr_SetString(PyExc_ValueError, "nodes must be a 2-D array of ints");
499499
CLEANUP
500500
return NULL;
501501
}
502-
neighbors = PyArray_FROMANY(pyneighbors, PyArray_INT, 2, 2, NPY_IN_ARRAY);
502+
neighbors = PyArray_FROMANY(pyneighbors, NPY_INT, 2, 2, NPY_IN_ARRAY);
503503
if (!neighbors) {
504504
PyErr_SetString(PyExc_ValueError, "neighbors must be a 2-D array of ints");
505505
CLEANUP
@@ -512,13 +512,13 @@ static PyObject *nn_interpolate_unstructured_method(PyObject *self, PyObject *ar
512512
CLEANUP
513513
return NULL;
514514
}
515-
intx = PyArray_FROM_OTF(pyintx, PyArray_DOUBLE, NPY_IN_ARRAY);
515+
intx = PyArray_FROM_OTF(pyintx, NPY_DOUBLE, NPY_IN_ARRAY);
516516
if (!intx) {
517517
PyErr_SetString(PyExc_ValueError, "intx must be an array of floats");
518518
CLEANUP
519519
return NULL;
520520
}
521-
inty = PyArray_FROM_OTF(pyinty, PyArray_DOUBLE, NPY_IN_ARRAY);
521+
inty = PyArray_FROM_OTF(pyinty, NPY_DOUBLE, NPY_IN_ARRAY);
522522
if (!inty) {
523523
PyErr_SetString(PyExc_ValueError, "inty must be an array of floats");
524524
CLEANUP
@@ -536,7 +536,7 @@ static PyObject *nn_interpolate_unstructured_method(PyObject *self, PyObject *ar
536536
return NULL;
537537
}
538538
}
539-
intz = PyArray_SimpleNew(PyArray_ND(intx), PyArray_DIMS(intx), PyArray_DOUBLE);
539+
intz = PyArray_SimpleNew(PyArray_ND(intx), PyArray_DIMS(intx), NPY_DOUBLE);
540540
if (!intz) {
541541
CLEANUP
542542
return NULL;
@@ -586,19 +586,19 @@ static PyObject *nn_interpolate_method(PyObject *self, PyObject *args)
586586
&pyneighbors)) {
587587
return NULL;
588588
}
589-
x = PyArray_FROMANY(pyx, PyArray_DOUBLE, 1, 1, NPY_IN_ARRAY);
589+
x = PyArray_FROMANY(pyx, NPY_DOUBLE, 1, 1, NPY_IN_ARRAY);
590590
if (!x) {
591591
PyErr_SetString(PyExc_ValueError, "x must be a 1-D array of floats");
592592
CLEANUP
593593
return NULL;
594594
}
595-
y = PyArray_FROMANY(pyy, PyArray_DOUBLE, 1, 1, NPY_IN_ARRAY);
595+
y = PyArray_FROMANY(pyy, NPY_DOUBLE, 1, 1, NPY_IN_ARRAY);
596596
if (!y) {
597597
PyErr_SetString(PyExc_ValueError, "y must be a 1-D array of floats");
598598
CLEANUP
599599
return NULL;
600600
}
601-
z = PyArray_FROMANY(pyz, PyArray_DOUBLE, 1, 1, NPY_IN_ARRAY);
601+
z = PyArray_FROMANY(pyz, NPY_DOUBLE, 1, 1, NPY_IN_ARRAY);
602602
if (!z) {
603603
PyErr_SetString(PyExc_ValueError, "z must be a 1-D array of floats");
604604
CLEANUP
@@ -610,19 +610,19 @@ static PyObject *nn_interpolate_method(PyObject *self, PyObject *args)
610610
CLEANUP
611611
return NULL;
612612
}
613-
centers = PyArray_FROMANY(pycenters, PyArray_DOUBLE, 2, 2, NPY_IN_ARRAY);
613+
centers = PyArray_FROMANY(pycenters, NPY_DOUBLE, 2, 2, NPY_IN_ARRAY);
614614
if (!centers) {
615615
PyErr_SetString(PyExc_ValueError, "centers must be a 2-D array of ints");
616616
CLEANUP
617617
return NULL;
618618
}
619-
nodes = PyArray_FROMANY(pynodes, PyArray_INT, 2, 2, NPY_IN_ARRAY);
619+
nodes = PyArray_FROMANY(pynodes, NPY_INT, 2, 2, NPY_IN_ARRAY);
620620
if (!nodes) {
621621
PyErr_SetString(PyExc_ValueError, "nodes must be a 2-D array of ints");
622622
CLEANUP
623623
return NULL;
624624
}
625-
neighbors = PyArray_FROMANY(pyneighbors, PyArray_INT, 2, 2, NPY_IN_ARRAY);
625+
neighbors = PyArray_FROMANY(pyneighbors, NPY_INT, 2, 2, NPY_IN_ARRAY);
626626
if (!neighbors) {
627627
PyErr_SetString(PyExc_ValueError, "neighbors must be a 2-D array of ints");
628628
CLEANUP
@@ -638,7 +638,7 @@ static PyObject *nn_interpolate_method(PyObject *self, PyObject *args)
638638

639639
dims[0] = ysteps;
640640
dims[1] = xsteps;
641-
grid = PyArray_SimpleNew(2, dims, PyArray_DOUBLE);
641+
grid = PyArray_SimpleNew(2, dims, NPY_DOUBLE);
642642
if (!grid) {
643643
CLEANUP
644644
return NULL;
@@ -670,12 +670,12 @@ static PyObject *delaunay_method(PyObject *self, PyObject *args)
670670
if (!PyArg_ParseTuple(args, "OO", &pyx, &pyy)) {
671671
return NULL;
672672
}
673-
x = PyArray_FROMANY(pyx, PyArray_DOUBLE, 1, 1, NPY_IN_ARRAY);
673+
x = PyArray_FROMANY(pyx, NPY_DOUBLE, 1, 1, NPY_IN_ARRAY);
674674
if (!x) {
675675
PyErr_SetString(PyExc_ValueError, "x must be a 1-D array of floats");
676676
goto fail;
677677
}
678-
y = PyArray_FROMANY(pyy, PyArray_DOUBLE, 1, 1, NPY_IN_ARRAY);
678+
y = PyArray_FROMANY(pyy, NPY_DOUBLE, 1, 1, NPY_IN_ARRAY);
679679
if (!y) {
680680
PyErr_SetString(PyExc_ValueError, "y must be a 1-D array of floats");
681681
goto fail;

‎lib/matplotlib/tri/_tri.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ void Triangulation::calculate_edges()
328328

329329
// Convert to python _edges array.
330330
npy_intp dims[2] = {static_cast<npy_intp>(edge_set.size()), 2};
331-
_edges = (PyArrayObject*)PyArray_SimpleNew(2, dims, PyArray_INT);
331+
_edges = (PyArrayObject*)PyArray_SimpleNew(2, dims, NPY_INT);
332332
int* edges_ptr = (int*)PyArray_DATA(_edges);
333333
for (EdgeSet::const_iterator it = edge_set.begin(); it != edge_set.end(); ++it) {
334334
*edges_ptr++ = it->start;
@@ -343,7 +343,7 @@ void Triangulation::calculate_neighbors()
343343

344344
// Create _neighbors array with shape (ntri,3) and initialise all to -1.
345345
npy_intp dims[2] = {_ntri,3};
346-
_neighbors = (PyArrayObject*)PyArray_SimpleNew(2, dims, PyArray_INT);
346+
_neighbors = (PyArrayObject*)PyArray_SimpleNew(2, dims, NPY_INT);
347347
int* neighbors_ptr = (int*)PyArray_DATA(_neighbors);
348348
std::fill(neighbors_ptr, neighbors_ptr + 3*_ntri, -1);
349349

@@ -386,7 +386,7 @@ Py::Object Triangulation::calculate_plane_coefficients(const Py::Tuple &args)
386386
args.verify_length(1);
387387

388388
PyArrayObject* z = (PyArrayObject*)PyArray_ContiguousFromObject(
389-
args[0].ptr(), PyArray_DOUBLE, 1, 1);
389+
args[0].ptr(), NPY_DOUBLE, 1, 1);
390390
if (z == 0 || PyArray_DIM(z,0) != PyArray_DIM(_x,0)) {
391391
Py_XDECREF(z);
392392
throw Py::ValueError(
@@ -401,7 +401,7 @@ Py::Object Triangulation::calculate_plane_coefficients(const Py::Tuple &args)
401401

402402
npy_intp dims[2] = {_ntri, 3};
403403
planes_array = (PyArrayObject*)PyArray_SimpleNew(2, dims,
404-
PyArray_DOUBLE);
404+
NPY_DOUBLE);
405405
double* planes = (double*)PyArray_DATA(planes_array);
406406
const int* tris = get_triangles_ptr();
407407
const double* xs = (const double*)PyArray_DATA(_x);
@@ -624,7 +624,7 @@ Py::Object Triangulation::set_mask(const Py::Tuple &args)
624624
if (args[0] != Py::None())
625625
{
626626
_mask = (PyArrayObject*)PyArray_ContiguousFromObject(
627-
args[0].ptr(), PyArray_BOOL, 1, 1);
627+
args[0].ptr(), NPY_BOOL, 1, 1);
628628
if (_mask == 0 || PyArray_DIM(_mask,0) != PyArray_DIM(_triangles,0)) {
629629
Py_XDECREF(_mask);
630630
throw Py::ValueError(
@@ -712,7 +712,7 @@ Py::Object TriContourGenerator::contour_to_segs(const Contour& contour)
712712
const ContourLine& line = contour[i];
713713
npy_intp dims[2] = {static_cast<npy_intp>(line.size()),2};
714714
PyArrayObject* py_line = (PyArrayObject*)PyArray_SimpleNew(
715-
2, dims, PyArray_DOUBLE);
715+
2, dims, NPY_DOUBLE);
716716
double* p = (double*)PyArray_DATA(py_line);
717717
for (ContourLine::const_iterator it = line.begin(); it != line.end(); ++it) {
718718
*p++ = it->x;
@@ -736,13 +736,13 @@ Py::Object TriContourGenerator::contour_to_segs_and_kinds(const Contour& contour
736736
// Create segs array for point coordinates.
737737
npy_intp segs_dims[2] = {n_points, 2};
738738
PyArrayObject* segs = (PyArrayObject*)PyArray_SimpleNew(
739-
2, segs_dims, PyArray_DOUBLE);
739+
2, segs_dims, NPY_DOUBLE);
740740
double* segs_ptr = (double*)PyArray_DATA(segs);
741741

742742
// Create kinds array for code types.
743743
npy_intp kinds_dims[1] = {n_points};
744744
PyArrayObject* kinds = (PyArrayObject*)PyArray_SimpleNew(
745-
1, kinds_dims, PyArray_UBYTE);
745+
1, kinds_dims, NPY_UBYTE);
746746
unsigned char* kinds_ptr = (unsigned char*)PyArray_DATA(kinds);
747747

748748
for (line = contour.begin(); line != contour.end(); ++line) {
@@ -1367,9 +1367,9 @@ TrapezoidMapTriFinder::find_many(const Py::Tuple& args)
13671367

13681368
// Check input arguments.
13691369
PyArrayObject* x = (PyArrayObject*)PyArray_ContiguousFromObject(
1370-
args[0].ptr(), PyArray_DOUBLE, 0, 0);
1370+
args[0].ptr(), NPY_DOUBLE, 0, 0);
13711371
PyArrayObject* y = (PyArrayObject*)PyArray_ContiguousFromObject(
1372-
args[1].ptr(), PyArray_DOUBLE, 0, 0);
1372+
args[1].ptr(), NPY_DOUBLE, 0, 0);
13731373
bool ok = (x != 0 && y != 0 && PyArray_NDIM(x) == PyArray_NDIM(y));
13741374
int ndim = x == 0 ? 0 : PyArray_NDIM(x);
13751375
for (int i = 0; ok && i < ndim; ++i)
@@ -1383,7 +1383,7 @@ TrapezoidMapTriFinder::find_many(const Py::Tuple& args)
13831383

13841384
// Create integer array to return.
13851385
PyArrayObject* tri = (PyArrayObject*)PyArray_SimpleNew(
1386-
ndim, PyArray_DIMS(x), PyArray_INT);
1386+
ndim, PyArray_DIMS(x), NPY_INT);
13871387

13881388
// Fill returned array.
13891389
double* x_ptr = (double*)PyArray_DATA(x);
@@ -2234,9 +2234,9 @@ Py::Object TriModule::new_triangulation(const Py::Tuple &args)
22342234

22352235
// x and y.
22362236
PyArrayObject* x = (PyArrayObject*)PyArray_ContiguousFromObject(
2237-
args[0].ptr(), PyArray_DOUBLE, 1, 1);
2237+
args[0].ptr(), NPY_DOUBLE, 1, 1);
22382238
PyArrayObject* y = (PyArrayObject*)PyArray_ContiguousFromObject(
2239-
args[1].ptr(), PyArray_DOUBLE, 1, 1);
2239+
args[1].ptr(), NPY_DOUBLE, 1, 1);
22402240
if (x == 0 || y == 0 || PyArray_DIM(x,0) != PyArray_DIM(y,0)) {
22412241
Py_XDECREF(x);
22422242
Py_XDECREF(y);
@@ -2245,7 +2245,7 @@ Py::Object TriModule::new_triangulation(const Py::Tuple &args)
22452245

22462246
// triangles.
22472247
PyArrayObject* triangles = (PyArrayObject*)PyArray_ContiguousFromObject(
2248-
args[2].ptr(), PyArray_INT, 2, 2);
2248+
args[2].ptr(), NPY_INT, 2, 2);
22492249
if (triangles == 0 || PyArray_DIM(triangles,1) != 3) {
22502250
Py_XDECREF(x);
22512251
Py_XDECREF(y);
@@ -2258,7 +2258,7 @@ Py::Object TriModule::new_triangulation(const Py::Tuple &args)
22582258
if (args[3].ptr() != 0 && args[3] != Py::None())
22592259
{
22602260
mask = (PyArrayObject*)PyArray_ContiguousFromObject(
2261-
args[3].ptr(), PyArray_BOOL, 1, 1);
2261+
args[3].ptr(), NPY_BOOL, 1, 1);
22622262
if (mask == 0 || PyArray_DIM(mask,0) != PyArray_DIM(triangles,0)) {
22632263
Py_XDECREF(x);
22642264
Py_XDECREF(y);
@@ -2274,7 +2274,7 @@ Py::Object TriModule::new_triangulation(const Py::Tuple &args)
22742274
if (args[4].ptr() != 0 && args[4] != Py::None())
22752275
{
22762276
edges = (PyArrayObject*)PyArray_ContiguousFromObject(
2277-
args[4].ptr(), PyArray_INT, 2, 2);
2277+
args[4].ptr(), NPY_INT, 2, 2);
22782278
if (edges == 0 || PyArray_DIM(edges,1) != 2) {
22792279
Py_XDECREF(x);
22802280
Py_XDECREF(y);
@@ -2290,7 +2290,7 @@ Py::Object TriModule::new_triangulation(const Py::Tuple &args)
22902290
if (args[5].ptr() != 0 && args[5] != Py::None())
22912291
{
22922292
neighbors = (PyArrayObject*)PyArray_ContiguousFromObject(
2293-
args[5].ptr(), PyArray_INT, 2, 2);
2293+
args[5].ptr(), NPY_INT, 2, 2);
22942294
if (neighbors == 0 ||
22952295
PyArray_DIM(neighbors,0) != PyArray_DIM(triangles,0) ||
22962296
PyArray_DIM(neighbors,1) != PyArray_DIM(triangles,1)) {
@@ -2318,7 +2318,7 @@ Py::Object TriModule::new_tricontourgenerator(const Py::Tuple &args)
23182318
throw Py::ValueError("Expecting a C++ Triangulation object");
23192319

23202320
PyArrayObject* z = (PyArrayObject*)PyArray_ContiguousFromObject(
2321-
args[1].ptr(), PyArray_DOUBLE, 1, 1);
2321+
args[1].ptr(), NPY_DOUBLE, 1, 1);
23222322
if (z == 0 ||
23232323
PyArray_DIM(z,0) != ((Triangulation*)tri.ptr())->get_npoints()) {
23242324
Py_XDECREF(z);

0 commit comments

Comments
 (0)