Changeset 745 for trunk/delaunay/scikits/delaunay/_delaunay.cpp

Timestamp:

01/17/08 18:21:48 (4 years ago)

Author:

rkern

Message:

* BUG: fix a leak.
* Add some tests for the duplicate point handling contributed by "pv".

Files:

• trunk/delaunay/scikits/delaunay/_delaunay.cpp (modified) (3 diffs)

trunk/delaunay/scikits/delaunay/_delaunay.cpp

@@ -127 +127 @@
     vdg.getNumbers(length, numtri);
 
+    // Count the actual number of edges
+    i = 0;
+    vdg.resetEdgeListIter();
+    while (vdg.getNextDelaunay(tri0, tri0x, tri0y, tri1, tri1x, tri1y, reg0, reg1))
+        i++;
+    length = i;
+
     dim[0] = length;
     dim[1] = 2;
@@ -448 +455 @@
 {
     PyObject *pyx, *pyy, *pyz, *pycenters, *pynodes, *pyneighbors, *pyintx, *pyinty;
-    PyObject *x, *y, *z, *centers, *nodes, *neighbors, *intx, *inty, *intz;
+    PyObject *x = NULL, *y = NULL, *z = NULL, *centers = NULL, *nodes = NULL,
+        *neighbors = NULL, *intx = NULL, *inty = NULL, *intz;
     double defvalue;
     int size, npoints, ntriangles;
@@ -544 +552 @@
         (double*)PyArray_DATA(intz), defvalue);
 
-    CLEANUP
+    Py_XDECREF(x);
+    Py_XDECREF(y);
+    Py_XDECREF(z);
+    Py_XDECREF(intx);
+    Py_XDECREF(inty);
+    Py_XDECREF(centers);
+    Py_XDECREF(nodes);
+    Py_XDECREF(neighbors);
     return intz;
 }