Revision: 5508
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5508&view=rev
Author: jdh2358
Date: 2008-06-13 08:04:49 -0700 (Fri, 13 Jun 2008)
Log Message:
-----------
fixed list of backends in the rc template
Modified Paths:
--------------
trunk/matplotlib/matplotlibrc.template
trunk/matplotlib/src/ft2font.cpp
Modified: trunk/matplotlib/matplotlibrc.template
===================================================================
--- trunk/matplotlib/matplotlibrc.template 2008-06-13 14:57:50 UTC (rev
5507)
+++ trunk/matplotlib/matplotlibrc.template 2008-06-13 15:04:49 UTC (rev
5508)
@@ -19,8 +19,8 @@
# such as 0.75 - a legal html color name, eg red, blue, darkslategray
#### CONFIGURATION BEGINS HERE
-# the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg
-# WX WXAgg Agg Cairo GD GDK Paint PS PDF SVG Template
+# the default backend; one of GTK GTKAgg GTKCairo CocoaAgg FltkAgg
+# QtAgg Qt4Agg TkAgg WX WXAgg Agg Cairo GDK PS PDF SVG Template
backend : %(backend)s
numerix : %(numerix)s # numpy, Numeric or numarray
#maskedarray : False # True to use external maskedarray module
Modified: trunk/matplotlib/src/ft2font.cpp
===================================================================
--- trunk/matplotlib/src/ft2font.cpp 2008-06-13 14:57:50 UTC (rev 5507)
+++ trunk/matplotlib/src/ft2font.cpp 2008-06-13 15:04:49 UTC (rev 5508)
@@ -265,15 +265,15 @@
_VERBOSE("FT2Image::as_array");
args.verify_length(0);
- int dimensions[2];
+ npy_intp dimensions[2];
dimensions[0] = get_height(); //numrows
dimensions[1] = get_width(); //numcols
- //PyArrayObject *A = (PyArrayObject *) PyArray_SimpleNewFromData(2,
dimensions, PyArray_UBYTE, _buffer);
+ PyArrayObject *A = (PyArrayObject *) PyArray_SimpleNewFromData(2,
dimensions, PyArray_UBYTE, _buffer);
+ /*
-
PyArrayObject *A = (PyArrayObject *) PyArray_FromDims(2, dimensions,
PyArray_UBYTE);
@@ -284,8 +284,8 @@
while (src != src_end) {
*dst++ = *src++;
}
+ */
-
return Py::asObject((PyObject*)A);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
