fixed an agg to string mem leak

jdh2358 · jdh2358 · commit 47a49239d272 · 2004-07-01T13:38:19.000Z
svn path=/trunk/matplotlib/; revision=376
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,8 @@
 New entries should be added at the top
 =======
 
+2004-07-01 Fixed a memory leak in image and agg to string methods
+
 2004-06-25 Fixed fonts_demo spacing problems and added a kwargs
            version of the fonts_demo fonts_demo_kw.py - JDH
 
diff --git a/TODO b/TODO
@@ -452,3 +452,5 @@
 -- DONE clear agg bg to 0 alpha
 
 -- DONE reset build flags in setup.py
+
+-- ad wxagg extension code to goals
diff --git a/examples/dynamic_image_gtk.py b/examples/dynamic_image_gtk.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+"""
+An animated image - Thanks to Andrew Straw who originally provided
+this examples as dynamic_image_wx.py
+"""
+import sys, time, os, gc
+from matplotlib import rcParams
+# there is a bug in Numeric 23.1 that crashes with this examples
+rcParams['numerix'] = 'numarray'
+
+from matplotlib.matlab import *
+import gtk
+
+fig = figure(1)
+a = subplot(111)
+x = arange(120.0)*2*pi/120.0
+x.resize((100,120))
+y = arange(100.0)*2*pi/100.0
+y.resize((120,100))
+y = transpose(y)
+z = sin(x) + cos(y)
+im = a.imshow( z, cmap=cm.jet)#, interpolation='nearest')
+
+
+manager = get_current_fig_manager()
+cnt = 0
+tstart = time.time()
+def updatefig(*args):
+    global x, y, cnt, start
+    x += pi/15
+    y += pi/20
+    z = sin(x) + cos(y)
+    im.set_array(z)
+    manager.canvas.draw()
+    cnt += 1
+    if cnt==50:
+        print 'FPS', cnt/(time.time() - tstart)
+        return gtk.FALSE
+    return True
+
+
+cnt = 0
+
+gtk.idle_add(updatefig)
+show()
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -1005,6 +1005,7 @@ RendererAgg::write_png(const Py::Tuple& args)
   return Py::Object();
 }
 
+
 Py::Object 
 RendererAgg::tostring_rgb(const Py::Tuple& args) {
   //"Return the rendered buffer as an RGB string";
@@ -1013,8 +1014,7 @@ RendererAgg::tostring_rgb(const Py::Tuple& args) {
   
   args.verify_length(0);    
   int row_len = width*3;
-  unsigned char* buf_tmp = 
-    new unsigned char[row_len * height];
+  unsigned char buf_tmp[row_len * height];
   agg::rendering_buffer renderingBufferTmp;
   renderingBufferTmp.attach(buf_tmp, 
 			    width, 
@@ -1025,14 +1025,13 @@ RendererAgg::tostring_rgb(const Py::Tuple& args) {
   
   
   //todo: how to do this with native CXX
-  return Py::Object(Py_BuildValue("s#", 
+  return Py::asObject(Py_BuildValue("s#", 
 				  buf_tmp, 
 				  row_len * height));
   //len = row_len * height
   //std::string s(buf_tmp);
   //return Py::String(buf_tmp, row_len * height);
 }
-
 agg::rgba
 RendererAgg::get_color(const Py::Object& gc) {
   
diff --git a/src/_image.cpp b/src/_image.cpp
@@ -152,8 +152,8 @@ Image::as_str(const Py::Tuple& args) {
   args.verify_length(1);
   int flipud = Py::Int(args[0]);
   if (!flipud) {
-    return Py::Object(Py_BuildValue("lls#", rowsOut, colsOut, 
-				    bufferOut, colsOut*rowsOut*4));
+    return Py::asObject(Py_BuildValue("lls#", rowsOut, colsOut, 
+				      bufferOut, colsOut*rowsOut*4));
   }
 
   const size_t NUMBYTES(rowsOut * colsOut * BPP);
@@ -167,8 +167,8 @@ Image::as_str(const Py::Tuple& args) {
       buffer[ind++] = *(bufferOut + start + j);
     }
   }
-  return Py::Object(Py_BuildValue("lls#", rowsOut, colsOut, 
-				  buffer, NUMBYTES));
+  return Py::asObject(Py_BuildValue("lls#", rowsOut, colsOut, 
+				    buffer, NUMBYTES));
   
 }
 

Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,8 @@ Image::as_str(const Py::Tuple& args) {`
`152`	`152`	`args.verify_length(1);`
`153`	`153`	`int flipud = Py::Int(args[0]);`
`154`	`154`	`if (!flipud) {`
`155`		`- return Py::Object(Py_BuildValue("lls#", rowsOut, colsOut,`
`156`		`- bufferOut, colsOutrowsOut4));`
	`155`	`+ return Py::asObject(Py_BuildValue("lls#", rowsOut, colsOut,`
	`156`	`+ bufferOut, colsOutrowsOut4));`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`const size_t NUMBYTES(rowsOut * colsOut * BPP);`
`@@ -167,8 +167,8 @@ Image::as_str(const Py::Tuple& args) {`
`167`	`167`	`buffer[ind++] = *(bufferOut + start + j);`
`168`	`168`	`}`
`169`	`169`	`}`
`170`		`- return Py::Object(Py_BuildValue("lls#", rowsOut, colsOut,`
`171`		`- buffer, NUMBYTES));`
	`170`	`+ return Py::asObject(Py_BuildValue("lls#", rowsOut, colsOut,`
	`171`	`+ buffer, NUMBYTES));`
`172`	`172`
`173`	`173`	`}`
`174`	`174`