[Scipy-svn] r2224 - trunk/Lib/sandbox/delaunay

scipy-svn at scipy.org scipy-svn at scipy.org
Sun Sep 24 00:49:12 CDT 2006


Author: rkern
Date: 2006-09-24 00:49:03 -0500 (Sun, 24 Sep 2006)
New Revision: 2224

Modified:
   trunk/Lib/sandbox/delaunay/_delaunay.cpp
Log:
Fix #254

Modified: trunk/Lib/sandbox/delaunay/_delaunay.cpp
===================================================================
--- trunk/Lib/sandbox/delaunay/_delaunay.cpp	2006-09-24 05:28:38 UTC (rev 2223)
+++ trunk/Lib/sandbox/delaunay/_delaunay.cpp	2006-09-24 05:49:03 UTC (rev 2224)
@@ -362,7 +362,7 @@
 
     PyArrayObject *planes, *x, *y, *nodes, *neighbors;
 
-    if (!PyArg_ParseTuple(args, "ddlddldOOOOO", &x0, &x1, &xsteps, &y0, &y1, &ysteps,
+    if (!PyArg_ParseTuple(args, "ddiddidOOOOO", &x0, &x1, &xsteps, &y0, &y1, &ysteps,
            &defvalue, &pyplanes, &pyx, &pyy, &pynodes, &pyneighbors)) {
         return NULL;
     }
@@ -524,12 +524,11 @@
     PyObject *pyx, *pyy, *pyz, *pycenters, *pynodes, *pyneighbors, *grid;
     PyArrayObject *x, *y, *z, *centers, *nodes, *neighbors;
     double x0, x1, y0, y1, defvalue;
-    double *grid_ptr;
     int xsteps, ysteps;
     int npoints, ntriangles;
     intp dims[2];
 
-    if (!PyArg_ParseTuple(args, "ddlddldOOOOOO", &x0, &x1, &xsteps, 
+    if (!PyArg_ParseTuple(args, "ddiddidOOOOOO", &x0, &x1, &xsteps, 
         &y0, &y1, &ysteps, &defvalue, &pyx, &pyy, &pyz, &pycenters, &pynodes,
         &pyneighbors)) {
         return NULL;
@@ -579,7 +578,6 @@
     dims[1] = xsteps;
     grid = PyArray_SimpleNew(2, dims, PyArray_DOUBLE);
     if (!grid) {CLEANUP} // goto fail;
-    grid_ptr = (double*)PyArray_DATA(grid);
 
     NaturalNeighbors nn(npoints, ntriangles, 
         (double*)PyArray_DATA(x), (double*)PyArray_DATA(y),



More information about the Scipy-svn mailing list