plugged copy from bbox leak

jdh2358 · jdh2358 · commit 4a3498489fbe · 2006-07-18T19:49:42.000Z
svn path=/trunk/matplotlib/; revision=2580
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -639,7 +639,7 @@ RendererAgg::copy_from_bbox(const Py::Tuple& args) {
   */
   int boxwidth = r.x2-r.x1;
   int boxheight = r.y2-r.y1;
-  int boxstride = boxwidth*4;
+  int boxstride = boxwidth*4; 
   agg::buffer buf(boxwidth, boxheight, boxstride, false);
   if (buf.data ==NULL) {
     throw Py::MemoryError("RendererAgg::copy_from_bbox could not allocate memory for buffer");
@@ -652,8 +652,8 @@ RendererAgg::copy_from_bbox(const Py::Tuple& args) {
   renderer_base rb(pf);
   //rb.clear(agg::rgba(1, 0, 0)); //todo remove me
   rb.copy_from(*renderingBuffer, &r, -r.x1, -r.y1);
-  BufferRegion* reg = new BufferRegion(buf, r);
-
+  BufferRegion* reg = new BufferRegion(buf, r, true);
+ 
   return Py::asObject(reg);
 
 
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
@@ -46,16 +46,19 @@ typedef agg::scanline_bin scanline_bin;
 // a class in the swig wrapper
 class BufferRegion : public Py::PythonExtension<BufferRegion> {
 public:
-  BufferRegion( agg::buffer& aggbuf, const agg::rect &r) : aggbuf(aggbuf), rect(r) {}
+  BufferRegion( agg::buffer& aggbuf, const agg::rect &r, bool freemem=true) : aggbuf(aggbuf), rect(r), freemem(freemem) {}
   agg::buffer aggbuf;
   agg::rect rect;
+  bool freemem;
   Py::Object to_string(const Py::Tuple &args);
 
   static void init_type(void);
   virtual ~BufferRegion() {
     //std::cout << "buffer region bye bye" << std::endl;
-    delete [] aggbuf.data;
-    aggbuf.data = NULL;
+    if (freemem) {
+      delete [] aggbuf.data;
+      aggbuf.data = NULL;
+    }
   };
 };
 
diff --git a/swig/agg_buffer.h b/swig/agg_buffer.h
@@ -24,9 +24,11 @@ namespace agg {
       
     }
     ~buffer() {
-      //std::cout << "bye bye" << std::endl;
-      if (freemem) delete [] data;
-      data = NULL;      
+      //std::cout << "bye bye " << freemem << std::endl;
+      if (freemem) {
+	delete [] data;
+	data = NULL;      
+      }
     }
     
 

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,11 @@ namespace agg {`
`24`	`24`
`25`	`25`	`}`
`26`	`26`	`~buffer() {`
`27`		`- //std::cout << "bye bye" << std::endl;`
`28`		`- if (freemem) delete [] data;`
`29`		`- data = NULL;`
	`27`	`+ //std::cout << "bye bye " << freemem << std::endl;`
	`28`	`+ if (freemem) {`
	`29`	`+ delete [] data;`
	`30`	`+ data = NULL;`
	`31`	`+ }`
`30`	`32`	`}`
`31`	`33`
`32`	`34`