Update to use new numpy macros.

mdboom · mdboom · commit eb05076e592c · 2007-11-14T18:42:52.000Z
svn path=/branches/transforms/; revision=4284
diff --git a/src/agg_py_path_iterator.h b/src/agg_py_path_iterator.h
@@ -20,7 +20,7 @@ class PathIterator {
     
     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) {
diff --git a/src/agg_py_transforms.h b/src/agg_py_transforms.h
@@ -63,7 +63,7 @@ bool py_convert_bbox(PyObject* bbox_obj, double& l, double& b, double& r, double
   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.");
     }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ bool py_convert_bbox(PyObject* bbox_obj, double& l, double& b, double& r, double`
`63`	`63`	`try {`
`64`	`64`	`bbox = (PyArrayObject*) PyArray_FromObject(bbox_obj, PyArray_DOUBLE, 2, 2);`
`65`	`65`
`66`		`- if (!bbox \|\| bbox->nd != 2 \|\| bbox->dimensions[0] != 2 \|\| bbox->dimensions[1] != 2) {`
	`66`	`+ if (!bbox \|\| PyArray_NDIM(bbox) != 2 \|\| PyArray_DIM(bbox, 0) != 2 \|\| PyArray_DIM(bbox, 1) != 2) {`
`67`	`67`	`throw Py::TypeError`
`68`	`68`	`("Argument 3 to agg_to_gtk_drawable must be a Bbox object.");`
`69`	`69`	`}`