From: <jd...@us...> - 2008-06-12 20:01:25
|
Revision: 5495 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5495&view=rev Author: jdh2358 Date: 2008-06-12 13:01:24 -0700 (Thu, 12 Jun 2008) Log Message: ----------- revereted to manual array data fill in ft2font.as_array Modified Paths: -------------- trunk/matplotlib/Makefile trunk/matplotlib/src/ft2font.cpp Modified: trunk/matplotlib/Makefile =================================================================== --- trunk/matplotlib/Makefile 2008-06-12 19:48:23 UTC (rev 5494) +++ trunk/matplotlib/Makefile 2008-06-12 20:01:24 UTC (rev 5495) @@ -32,4 +32,14 @@ CFLAGS="-Os -arch i386 -arch ppc" LDFLAGS="-Os -arch i386 -arch ppc" python setup.py build +jdh_doc_snapshot: + svn up;\ + python setup.py install --prefix=~/dev;\ + cd doc;\ + rm -rf build;\ + python make.py html;\ + python make.py sf + + + Modified: trunk/matplotlib/src/ft2font.cpp =================================================================== --- trunk/matplotlib/src/ft2font.cpp 2008-06-12 19:48:23 UTC (rev 5494) +++ trunk/matplotlib/src/ft2font.cpp 2008-06-12 20:01:24 UTC (rev 5495) @@ -270,10 +270,10 @@ 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. |