more mem leak fixes in transforms and ft2font

jdh2358 · jdh2358 · commit 9f51a8438356 · 2004-06-11T16:19:41.000Z
svn path=/trunk/matplotlib/; revision=340
diff --git a/.matplotlibrc b/.matplotlibrc
@@ -36,11 +36,24 @@ interactive  : False     # see http://matplotlib.sourceforge.net/interactive.htm
 lines.linewidth   : 0.5     # line width in points
 lines.linestyle   : -       # solid line
 lines.color       : b       # blue; color format or hex string
-lines.markersize  : 6       # markersize, in points
-lines.antialiased : True    # render lines in antialised (no jaggies)
+lines.markerfacecolor  : b       
+lines.markeredgecolor  : k
+lines.markeredgewidth  : 0.5
+lines.markersize  : 6        # markersize, in points
+lines.antialiased : True     # render lines in antialised (no jaggies)
 lines.data_clipping : False  # Use data clipping in addition to viewport
-                            # clipping.  Useful if you plot long data
-                            # sets with only a fraction in the viewport
+                             # clipping.  Useful if you plot long data
+                             # sets with only a fraction in the viewport
+
+### Patches 
+# Patches are graphical objects that fill 2D space, like polygons or
+# circles.  See
+# http://matplotlib.sourceforge.net/matplotlib.patches.html for more
+# information on patch properties
+patch.linewidth   	: 0.5     # edge width in points
+patch.facecolor  	: b       
+patch.edgecolor  	: k
+patch.antialiased 	: True    # render patches in antialised (no jaggies)
 
 ### FONT
 #
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,9 +1,23 @@
 New entries should be added at the top
+=======
+
+
+2004-06-11 More memory leak fixes in transforms and ft2font - JDH
 
 2004-06-11 Eliminated numerix .numerix file and environment variable
 	   NUMERIX.  Fixed bug which prevented command line overrides:
 	   --numarray or --numeric. - JTM
 
+2004-06-10 Added rc configuration function rc; deferred all rc param
+           setting until object creation time; added new rc attrs:
+           lines.markerfacecolor, lines.markeredgecolor,
+           lines.markeredgewidth, patch.linewidth, patch.facecolor,
+           patch.edgecolor, patch.antialiased - JDH
+
+
+---------------------------------------------------------------
+2004-06-09 0.54.2 released
+
 2004-06-08 Rewrote ft2font using CXX as part of general memory leak
            fixes; also fixed transform memory leaks  - JDH
 
diff --git a/TODO b/TODO
@@ -410,6 +410,24 @@
 
 -- use RGBA throughout lib
 
--- fix wrt log and recommit cvs
+-- DONE fix wrt log and recommit cvs
 
--- check Fernando's bounds problem with pcolor.
+-- check Fernando's bounds problem with pcolor.
+
+-- Write John's Letter
+
+-- add default args to imshow per Fernando's suggestion
+
+-- DONE - check out Fernando's wx prob
+
+-- add interp and aspect info to imshow doc
+
+-- add write png method to image module
+
+-- change the viewlim on call to log if min ax <=0
+
+-- fix set_def font example and update API_CHANGES
+
+-- upload 0.54.2 zip
+
+-- need a new way to indicate linestyle=None!
diff --git a/setup.py b/setup.py
@@ -6,6 +6,7 @@
 respectively; set them to 0 if you do not want to build them
 """
 
+# The NUMERIX
 NUMERIX = 'Numeric'  # or numarray
 # build the freetype2 interface - this is required for mathtext
 # Requires freetype2, and libz
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -157,23 +157,23 @@ RendererAgg::draw_polygon(const Py::Tuple& args) {
     std::cout << "RendererAgg::draw_polygon" << std::endl;
   
   args.verify_length(3);  
-  
+
   Py::Object gcEdge( args[0] );
   Py::Object rgbFaceMaybeNone( args[1] );
   Py::SeqBase<Py::Object> points( args[2] );
-  
+
   
   set_clip_rectangle(gcEdge);
   agg::gen_stroke::line_cap_e cap = get_linecap(gcEdge);
   agg::gen_stroke::line_join_e join = get_joinstyle(gcEdge);
   
   double lw = points_to_pixels ( gcEdge.getAttr("_linewidth") ) ;
-  
+
   size_t Npoints = points.length();
   if (Npoints<=0)
     return Py::Object();
-  
-  
+
+
   // dump the x.y vertices into a double array for faster look ahread
   // and behind access
   double xs[Npoints];
@@ -187,6 +187,7 @@ RendererAgg::draw_polygon(const Py::Tuple& args) {
 
   }
   
+
   agg::path_storage path;  
   for (size_t j=0; j<Npoints; ++j) {
 
@@ -197,7 +198,7 @@ RendererAgg::draw_polygon(const Py::Tuple& args) {
     else path.line_to(x,y); 
   }
   path.close_polygon();
-  
+
   agg::rgba edgecolor = get_color(gcEdge);
 
   
@@ -209,7 +210,7 @@ RendererAgg::draw_polygon(const Py::Tuple& args) {
     theRasterizer->add_path(path);    
     theRasterizer->render(*slineP8, *theRenderer);  
   }
-  
+
   //now fill the edge
   agg::conv_stroke<agg::path_storage> stroke(path);
   stroke.width(lw);
diff --git a/src/_image.cpp b/src/_image.cpp
@@ -569,8 +569,10 @@ _image_fromarray(PyObject *self, PyObject *args) {
   ImageObject *imo;
   
   imo = newImageObject(args);
-  if ( imo == NULL )
+  if ( imo == NULL ) {
+    Py_XDECREF(A);  
     return NULL;
+  }
   
   imo->rowsIn  = A->dimensions[0];
   imo->colsIn  = A->dimensions[1];
@@ -604,6 +606,7 @@ _image_fromarray(PyObject *self, PyObject *args) {
     if (A->dimensions[2] != 3 && A->dimensions[2] != 4 ) {
       PyErr_SetString(PyExc_ValueError, 
 		      "3rd dimension must be length 3 (RGB) or 4 (RGBA)"); 
+      Py_XDECREF(A);  
       return NULL;
       
     }
@@ -635,9 +638,10 @@ _image_fromarray(PyObject *self, PyObject *args) {
   else   { // error
     PyErr_SetString(PyExc_ValueError, 
 		    "Illegal array rank; must be rank; must 2 or 3"); 
+    Py_XDECREF(A);  
     return NULL;
   }
-  
+  Py_XDECREF(A);  
   return (PyObject *)imo;
 }
 
diff --git a/src/_transforms.cpp b/src/_transforms.cpp
@@ -1,13 +1,17 @@
 #include <functional>
 #include <numeric>
 #include "_transforms.h"
- 
+
+
 #ifdef NUMARRAY
 #include "numarray/arrayobject.h" 
 #else
 #include "Numeric/arrayobject.h" 
 #endif   
 
+
+
+
 #define DEBUG_MEM 0
 
 
@@ -650,6 +654,7 @@ Transformation::numerix_x_y(const Py::Tuple & args) {
   if (x==NULL) 
     throw Py::TypeError("Transformation::numerix_x_y expected numerix array");
 
+  
   PyArrayObject *y = (PyArrayObject *) PyArray_ContiguousFromObject(yo.ptr(), PyArray_DOUBLE, 1, 1); 
   
   if (y==NULL) 
@@ -667,13 +672,21 @@ Transformation::numerix_x_y(const Py::Tuple & args) {
 
   int dimensions[1];
   dimensions[0] = Nx;
+
+  
   PyArrayObject *retx = (PyArrayObject *)PyArray_FromDims(1,dimensions,PyArray_DOUBLE);
-  if (retx==NULL)
+  if (retx==NULL) {
+    Py_XDECREF(x);
+    Py_XDECREF(y);
     throw Py::RuntimeError("Could not create return x array");
+  }
 
   PyArrayObject *rety = (PyArrayObject *)PyArray_FromDims(1,dimensions,PyArray_DOUBLE);
-  if (retx==NULL)
+  if (rety==NULL) {
+    Py_XDECREF(x);
+    Py_XDECREF(y);
     throw Py::RuntimeError("Could not create return x array");
+  }
 
   for (size_t i=0; i< Nx; ++i) {
 
@@ -684,10 +697,15 @@ Transformation::numerix_x_y(const Py::Tuple & args) {
     *(double *)(retx->data + i*retx->strides[0]) = xy.first;
     *(double *)(rety->data + i*rety->strides[0]) = xy.second;
   }
+  
+  Py_XDECREF(x);
+  Py_XDECREF(y);
 
   Py::Tuple ret(2);
   ret[0] = Py::Object((PyObject*)retx);
   ret[1] = Py::Object((PyObject*)rety);
+  Py_XDECREF(retx);
+  Py_XDECREF(rety);
   return ret;
 }
 
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -232,7 +232,18 @@ FT2Font::clear(const Py::Tuple & args) {
   
   pen.x = 0;
   pen.y = 0;
-  
+
+  for (size_t i=0; i<glyphs.size(); i++) {
+    FT_Done_Glyph( glyphs[i] );    
+  }
+
+  for (size_t i=0; i<gms.size(); i++) {
+    Py_DECREF(gms[i]);
+  }
+
+  glyphs.resize(0);
+  gms.resize(0);
+
   return Py::Object();
   
 }
