revereted to manual array data fill in ft2font.as_array

jdh2358 · jdh2358 · commit a60bbbc36ed5 · 2008-06-12T20:01:24.000Z
svn path=/trunk/matplotlib/; revision=5495
diff --git a/Makefile b/Makefile
@@ -32,4 +32,14 @@ build_osx105:
 	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
+
+
+
 
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -270,9 +270,9 @@ FT2Image::py_as_array(const Py::Tuple & args) {
   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,7 +284,7 @@ FT2Image::py_as_array(const Py::Tuple & args) {
   while (src != src_end) {
     *dst++ = *src++;
   }
-  */
+
 
   return Py::asObject((PyObject*)A);
 }

Original file line number	Diff line number	Diff line change
`@@ -270,9 +270,9 @@ FT2Image::py_as_array(const Py::Tuple & args) {`
`270`	`270`	`dimensions[1] = get_width(); //numcols`
`271`	`271`
`272`	`272`
`273`		`- PyArrayObject A = (PyArrayObject ) PyArray_SimpleNewFromData(2, dimensions, PyArray_UBYTE, _buffer);`
	`273`	`+ //PyArrayObject A = (PyArrayObject ) PyArray_SimpleNewFromData(2, dimensions, PyArray_UBYTE, _buffer);`
	`274`	`+`
`274`	`275`
`275`		`- /*`
`276`	`276`
`277`	`277`	`PyArrayObject A = (PyArrayObject ) PyArray_FromDims(2, dimensions, PyArray_UBYTE);`
`278`	`278`
`@@ -284,7 +284,7 @@ FT2Image::py_as_array(const Py::Tuple & args) {`
`284`	`284`	`while (src != src_end) {`
`285`	`285`	`dst++ = src++;`
`286`	`286`	`}`
`287`		`- */`
	`287`	`+`
`288`	`288`
`289`	`289`	`return Py::asObject((PyObject*)A);`
`290`	`290`	`}`