Merge pull request #72 from PDAL/issue-71

Don't leak input arrays.

Author: abellgithub

pdal/PyPipeline.cpp

@@ -99,10 +99,6 @@ Pipeline::Pipeline(std::string const& json, std::vector<Array*> arrays) :
         };
 
         r.setIncrementer(incrementer);
-        PyObject* parray = (PyObject*)array->getPythonArray();
-        if (!parray)
-            throw pdal_error("array was none!");
-
         roots[0]->setInput(r);
     }
 

pdal/libpdalpython.pyx

@@ -93,28 +93,21 @@ def getDimensions():
 
 cdef class PyPipeline:
     cdef Pipeline *thisptr      # hold a c++ instance which we're wrapping
-
+    cdef vector[Array *] c_arrays;
 
     def __cinit__(self, unicode json, list arrays=None):
         cdef char* x = NULL
-        cdef Py_ssize_t n_arrays;
-        if arrays:
-            n_arrays = len(arrays)
-
-        cdef vector[Array*] c_arrays;
-        cdef np.ndarray np_array;
-        cdef Array* a
 
         if arrays is not None:
             for array in arrays:
-                a = new Array(array)
-                c_arrays.push_back(a)
-
-            self.thisptr = new Pipeline(json.encode('UTF-8'), c_arrays)
+                self.c_arrays.push_back(new Array(array))
+            self.thisptr = new Pipeline(json.encode('UTF-8'), self.c_arrays)
         else:
             self.thisptr = new Pipeline(json.encode('UTF-8'))
 
     def __dealloc__(self):
+        for array in self.c_arrays:
+            del array
         del self.thisptr
 
     property pipeline:

pdal/test/PythonFilterTest.cpp

@@ -682,10 +682,10 @@ TEST(PLangTest, PLangTest_aliases)
         "def yow(ins,outs):\n"
         "  \n"
         "  #print ins['X']\n"
-        "  #print ins['prefix.X']\n"
+        "  #print ins['prefix_X']\n"
         "  \n"
         "  X = ins['X']\n"
-        "  prefixX = ins['prefix.X']\n"
+        "  prefixX = ins['prefix_X']\n"
         "  \n"
         "  #print X\n"
         "  #print prefixX\n"
@@ -697,19 +697,19 @@ TEST(PLangTest, PLangTest_aliases)
         "  #print prefixY\n"
         "  \n"
         "  outs['Y'] = Y\n"
-        "  outs['prefix.Y'] = prefixY\n"
+        "  outs['prefix_Y'] = prefixY\n"
         "  \n"
         "  #print outs['Y']\n"
-        "  #print outs['prefix.Y']\n"
+        "  #print outs['prefix_Y']\n"
         "  return True\n"
         ;
 
     PointTable table;
     table.layout()->registerDim(Dimension::Id::X);
     table.layout()->registerDim(Dimension::Id::Y);
-    Dimension::Id prefixX = table.layout()->assignDim("prefix.X",
+    Dimension::Id prefixX = table.layout()->assignDim("prefix_X",
         Dimension::Type::Double);
-    Dimension::Id prefixY = table.layout()->assignDim("prefix.Y",
+    Dimension::Id prefixY = table.layout()->assignDim("prefix_Y",
         Dimension::Type::Double);
     PointViewPtr view(new PointView(table));
     view->setField(Dimension::Id::X, 0, 1);