patched leak in BufferRegion.to_string

cmoad · cmoad · commit e59c8cdc776e · 2006-07-19T12:50:38.000Z
svn path=/trunk/matplotlib/; revision=2582
diff --git a/examples/animation_blit_qt.py b/examples/animation_blit_qt.py
@@ -12,6 +12,7 @@
 
 TRUE  = 1
 FALSE = 0
+ITERS = 200
 
 import pylab as p
 import matplotlib.numerix as nx
@@ -44,9 +45,9 @@ def timerEvent(self, evt):
         # just redraw the axes rectangle
         self.canvas.blit(self.ax.bbox) 
     
-        if self.cnt==200:
+        if self.cnt==ITERS:
             # print the timing info and quit
-            print 'FPS:' , 200/(time.time()-self.tstart)
+            print 'FPS:' , ITERS/(time.time()-self.tstart)
             sys.exit()
 
         else:
diff --git a/lib/matplotlib/backends/backend_qtagg.py b/lib/matplotlib/backends/backend_qtagg.py
@@ -103,7 +103,7 @@ def paintEvent( self, e ):
                 p.drawRect( self.rect[0], self.rect[1], self.rect[2], self.rect[3] )
                 
         # we are blitting here
-        else: # TODO: Fix memory leak
+        else:
             bbox = self.replot
             w, h = int(bbox.width()), int(bbox.height())
             l, t = bbox.ll().x().get(), bbox.ur().y().get()
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -189,7 +189,8 @@ GCAgg::_set_clip_rectangle( const Py::Object& gc) {
 
 Py::Object BufferRegion::to_string(const Py::Tuple &args) {
   
-  return Py::String(PyString_FromStringAndSize((const char*)aggbuf.data,aggbuf.height*aggbuf.stride));
+  // owned=true to prevent memory leak
+  return Py::String(PyString_FromStringAndSize((const char*)aggbuf.data,aggbuf.height*aggbuf.stride), true);
 } 
 	 	      
 

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,8 @@ GCAgg::_set_clip_rectangle( const Py::Object& gc) {`
`189`	`189`
`190`	`190`	`Py::Object BufferRegion::to_string(const Py::Tuple &args) {`
`191`	`191`
`192`		`- return Py::String(PyString_FromStringAndSize((const char)aggbuf.data,aggbuf.heightaggbuf.stride));`
	`192`	`+ // owned=true to prevent memory leak`
	`193`	`+ return Py::String(PyString_FromStringAndSize((const char)aggbuf.data,aggbuf.heightaggbuf.stride), true);`
`193`	`194`	`}`
`194`	`195`
`195`	`196`