more fixes for numpy svn deprecation warnings

jdh2358 · jdh2358 · commit db89f5b168c6 · 2008-07-17T19:15:58.000Z
svn path=/trunk/matplotlib/; revision=5781
diff --git a/examples/pylab_examples/nan_test.py b/examples/pylab_examples/nan_test.py
@@ -22,8 +22,7 @@
 plot(t, s, '-', lw=2)
 
 xlabel('time (s)')
-ylabel('voltage (mV)')
-title('More NaNs at 0.0 and 1.0')
+ylabel('more nans')
 grid(True)
 
 show()
diff --git a/examples/pylab_examples/quadmesh_demo.py b/examples/pylab_examples/quadmesh_demo.py
@@ -40,6 +40,7 @@
 #  Or use the default, which is transparent:
 col = ax.pcolormesh(Qx,Qz,Zm)
 ax.set_title('With masked values')
-show()
+
 
 savefig("quadmesh_demo")
+show()
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -89,7 +89,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.98.2'
+__version__  = '0.98.3'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 
diff --git a/src/_backend_gdk.c b/src/_backend_gdk.c
@@ -28,7 +28,7 @@ pixbuf_get_pixels_array(PyObject *self, PyObject *args)
     PyGObject *py_pixbuf;
     GdkPixbuf *gdk_pixbuf;
     PyArrayObject *array;
-    int dims[3] = { 0, 0, 3 };
+    npy_intp dims[3] = { 0, 0, 3 };
 
     if (!PyArg_ParseTuple(args, "O!:pixbuf_get_pixels_array",
 			  &PyGdkPixbuf_Type, &py_pixbuf))
diff --git a/src/_path.cpp b/src/_path.cpp
@@ -846,7 +846,7 @@ Py::Object _path_module::clip_path_to_rect(const Py::Tuple &args)
 
     ::clip_to_rect(path, x0, y0, x1, y1, inside, results);
 
-    int dims[2];
+    npy_intp dims[2];
     dims[1] = 2;
     PyObject* py_results = PyList_New(results.size());
     if (!py_results)
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -249,7 +249,7 @@ _png_module::read_png(const Py::Tuple& args) {
 
 
 
-  int dimensions[3];
+  npy_intp dimensions[3];
   dimensions[0] = height;  //numrows
   dimensions[1] = width;   //numcols
   dimensions[2] = 4;
diff --git a/src/cntr.c b/src/cntr.c
@@ -1333,7 +1333,7 @@ build_cntr_list_v(long *np, double *xp, double *yp, int nparts, long ntotal)
 {
     PyObject *point, *all_contours;
     PyArrayObject *xv, *yv;
-    int dims[1];
+    npy_intp dims[1];
     int i;
     long j, k;
 
@@ -1343,8 +1343,8 @@ build_cntr_list_v(long *np, double *xp, double *yp, int nparts, long ntotal)
     for (i = 0; i < nparts; i++)
     {
         dims[0] = np[i];
-        xv = (PyArrayObject *) PyArray_FromDims(1, dims, PyArray_DOUBLE);
-        yv = (PyArrayObject *) PyArray_FromDims(1, dims, PyArray_DOUBLE);
+        xv = (PyArrayObject *) PyArray_SimpleNew(1, dims, PyArray_DOUBLE);
+        yv = (PyArrayObject *) PyArray_SimpleNew(1, dims, PyArray_DOUBLE);
         if (xv == NULL || yv == NULL)  goto error;
         for (j = 0; j < dims[0]; j++)
         {
@@ -1370,7 +1370,7 @@ build_cntr_list_v2(long *np, double *xp, double *yp, int nparts, long ntotal)
 {
     PyObject *all_contours;
     PyArrayObject *xyv;
-    int dims[2];
+    npy_intp dims[2];
     int i;
     long j, k;
 
@@ -1381,7 +1381,7 @@ build_cntr_list_v2(long *np, double *xp, double *yp, int nparts, long ntotal)
     {
         dims[0] = np[i];
         dims[1] = 2;
-        xyv = (PyArrayObject *) PyArray_FromDims(2, dims, PyArray_DOUBLE);
+        xyv = (PyArrayObject *) PyArray_SimpleNew(2, dims, PyArray_DOUBLE);
         if (xyv == NULL)  goto error;
         for (j = 0; j < dims[0]; j++)
         {
diff --git a/src/nxutils.c b/src/nxutils.c
@@ -108,7 +108,7 @@ points_inside_poly(PyObject *self, PyObject *args)
   PyObject *xypointsarg, *vertsarg, *ret;
   PyArrayObject *xypoints, *verts;
   PyArrayObject *mask;
-  int dimensions[1];
+  npy_intp dimensions[1];
 
   if (! PyArg_ParseTuple(args, "OO", &xypointsarg, &vertsarg))
     return NULL;
@@ -187,7 +187,7 @@ points_inside_poly(PyObject *self, PyObject *args)
   npoints = xypoints->dimensions[0];
   dimensions[0] = npoints;
 
-  mask = (PyArrayObject *)PyArray_FromDims(1,dimensions,PyArray_INT);
+  mask = (PyArrayObject *)PyArray_SimpleNew(1,dimensions,PyArray_INT);
   if (mask==NULL) {
     Py_XDECREF(verts);
     Py_XDECREF(xypoints);

Original file line number	Diff line number	Diff line change
`@@ -1333,7 +1333,7 @@ build_cntr_list_v(long np, double xp, double *yp, int nparts, long ntotal)`
`1333`	`1333`	`{`
`1334`	`1334`	`PyObject point, all_contours;`
`1335`	`1335`	`PyArrayObject xv, yv;`
`1336`		`- int dims[1];`
	`1336`	`+ npy_intp dims[1];`
`1337`	`1337`	`int i;`
`1338`	`1338`	`long j, k;`
`1339`	`1339`
`@@ -1343,8 +1343,8 @@ build_cntr_list_v(long np, double xp, double *yp, int nparts, long ntotal)`
`1343`	`1343`	`for (i = 0; i < nparts; i++)`
`1344`	`1344`	`{`
`1345`	`1345`	`dims[0] = np[i];`
`1346`		`- xv = (PyArrayObject *) PyArray_FromDims(1, dims, PyArray_DOUBLE);`
`1347`		`- yv = (PyArrayObject *) PyArray_FromDims(1, dims, PyArray_DOUBLE);`
	`1346`	`+ xv = (PyArrayObject *) PyArray_SimpleNew(1, dims, PyArray_DOUBLE);`
	`1347`	`+ yv = (PyArrayObject *) PyArray_SimpleNew(1, dims, PyArray_DOUBLE);`
`1348`	`1348`	`if (xv == NULL \|\| yv == NULL) goto error;`
`1349`	`1349`	`for (j = 0; j < dims[0]; j++)`
`1350`	`1350`	`{`
`@@ -1370,7 +1370,7 @@ build_cntr_list_v2(long np, double xp, double *yp, int nparts, long ntotal)`
`1370`	`1370`	`{`
`1371`	`1371`	`PyObject *all_contours;`
`1372`	`1372`	`PyArrayObject *xyv;`
`1373`		`- int dims[2];`
	`1373`	`+ npy_intp dims[2];`
`1374`	`1374`	`int i;`
`1375`	`1375`	`long j, k;`
`1376`	`1376`
`@@ -1381,7 +1381,7 @@ build_cntr_list_v2(long np, double xp, double *yp, int nparts, long ntotal)`
`1381`	`1381`	`{`
`1382`	`1382`	`dims[0] = np[i];`
`1383`	`1383`	`dims[1] = 2;`
`1384`		`- xyv = (PyArrayObject *) PyArray_FromDims(2, dims, PyArray_DOUBLE);`
	`1384`	`+ xyv = (PyArrayObject *) PyArray_SimpleNew(2, dims, PyArray_DOUBLE);`
`1385`	`1385`	`if (xyv == NULL) goto error;`
`1386`	`1386`	`for (j = 0; j < dims[0]; j++)`
`1387`	`1387`	`{`