Revision: 4284
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4284&view=rev
Author: mdboom
Date: 2007-11-14 10:42:52 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
Update to use new numpy macros.
Modified Paths:
--------------
branches/transforms/src/agg_py_path_iterator.h
branches/transforms/src/agg_py_transforms.h
Modified: branches/transforms/src/agg_py_path_iterator.h
===================================================================
--- branches/transforms/src/agg_py_path_iterator.h 2007-11-14 18:38:05 UTC
(rev 4283)
+++ branches/transforms/src/agg_py_path_iterator.h 2007-11-14 18:42:52 UTC
(rev 4284)
@@ -20,7 +20,7 @@
m_vertices = (PyArrayObject*)PyArray_FromObject
(vertices_obj.ptr(), PyArray_DOUBLE, 2, 2);
- if (!m_vertices || m_vertices->nd != 2 || m_vertices->dimensions[1] != 2)
+ if (!m_vertices || PyArray_NDIM(m_vertices) != 2 ||
PyArray_DIM(m_vertices, 1) != 2)
throw Py::ValueError("Invalid vertices array.");
if (codes_obj.ptr() != Py_None) {
Modified: branches/transforms/src/agg_py_transforms.h
===================================================================
--- branches/transforms/src/agg_py_transforms.h 2007-11-14 18:38:05 UTC (rev
4283)
+++ branches/transforms/src/agg_py_transforms.h 2007-11-14 18:42:52 UTC (rev
4284)
@@ -63,7 +63,7 @@
try {
bbox = (PyArrayObject*) PyArray_FromObject(bbox_obj, PyArray_DOUBLE, 2,
2);
- if (!bbox || bbox->nd != 2 || bbox->dimensions[0] != 2 ||
bbox->dimensions[1] != 2) {
+ if (!bbox || PyArray_NDIM(bbox) != 2 || PyArray_DIM(bbox, 0) != 2 ||
PyArray_DIM(bbox, 1) != 2) {
throw Py::TypeError
("Argument 3 to agg_to_gtk_drawable must be a Bbox object.");
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
