Changeset 1458de5 for interfaces/python/py-cvec.c

Timestamp:

Jul 11, 2012, 3:41:33 AM (12 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

988f580

Parents:

c71e405

Message:

aubio-types.h, aubiomodule.c: update for numpy 1.8

File:

• interfaces/python/py-cvec.c (modified) (8 diffs)

interfaces/python/py-cvec.c

@@ -126 +126 @@
 Py_cvec_set_norm (Py_cvec * vec, PyObject *input, void * closure)
 {
-  PyObject * array;
+  PyArrayObject * array;
   if (input == NULL) {
     PyErr_SetString (PyExc_ValueError, "input array is not a python object");
@@ -134 +134 @@
 
     // we got an array, convert it to a cvec.norm 
-    if (PyArray_NDIM (input) == 0) {
+    if (PyArray_NDIM ((PyArrayObject *)input) == 0) {
       PyErr_SetString (PyExc_ValueError, "input array is a scalar");
       goto fail;
-    } else if (PyArray_NDIM (input) > 2) {
+    } else if (PyArray_NDIM ((PyArrayObject *)input) > 2) {
       PyErr_SetString (PyExc_ValueError,
           "input array has more than two dimensions");
@@ -143 +143 @@
     }
 
-    if (!PyArray_ISFLOAT (input)) {
+    if (!PyArray_ISFLOAT ((PyArrayObject *)input)) {
       PyErr_SetString (PyExc_ValueError, "input array should be float");
       goto fail;
-    } else if (PyArray_TYPE (input) != AUBIO_NPY_SMPL) {
+    } else if (PyArray_TYPE ((PyArrayObject *)input) != AUBIO_NPY_SMPL) {
       PyErr_SetString (PyExc_ValueError, "input array should be float32");
       goto fail;
     }
-    array = input;
+    array = (PyArrayObject *)input;
 
     // check input array dimensions
@@ -162 +162 @@
           PyErr_Format (PyExc_ValueError,
                   "input array has length %d, but cvec has length %d",
-                  PyArray_SIZE (array), vec->o->length);
+                  (int)PyArray_SIZE (array), vec->o->length);
           goto fail;
       }
@@ -184 +184 @@
 Py_cvec_set_phas (Py_cvec * vec, PyObject *input, void * closure)
 {
-  PyObject * array;
+  PyArrayObject * array;
   if (input == NULL) {
     PyErr_SetString (PyExc_ValueError, "input array is not a python object");
@@ -192 +192 @@
 
     // we got an array, convert it to a cvec.phas
-    if (PyArray_NDIM (input) == 0) {
+    if (PyArray_NDIM ((PyArrayObject *)input) == 0) {
       PyErr_SetString (PyExc_ValueError, "input array is a scalar");
       goto fail;
-    } else if (PyArray_NDIM (input) > 2) {
+    } else if (PyArray_NDIM ((PyArrayObject *)input) > 2) {
       PyErr_SetString (PyExc_ValueError,
           "input array has more than two dimensions");
@@ -201 +201 @@
     }
 
-    if (!PyArray_ISFLOAT (input)) {
+    if (!PyArray_ISFLOAT ((PyArrayObject *)input)) {
       PyErr_SetString (PyExc_ValueError, "input array should be float");
       goto fail;
-    } else if (PyArray_TYPE (input) != AUBIO_NPY_SMPL) {
+    } else if (PyArray_TYPE ((PyArrayObject *)input) != AUBIO_NPY_SMPL) {
       PyErr_SetString (PyExc_ValueError, "input array should be float32");
       goto fail;
     }
-    array = input;
+    array = (PyArrayObject *)input;
 
     // check input array dimensions
@@ -220 +220 @@
           PyErr_Format (PyExc_ValueError,
                   "input array has length %d, but cvec has length %d",
-                  PyArray_SIZE (array), vec->o->length);
+                  (int)PyArray_SIZE (array), vec->o->length);
           goto fail;
       }