Changeset 911c22f for python

Timestamp:

May 12, 2016, 1:28:23 AM (9 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:

a138975

Parents:

bb4af3a

git-author:

Paul Brossier <piem@piem.org> (05/11/16 14:49:47)

git-committer:

Paul Brossier <piem@piem.org> (05/12/16 01:28:23)

Message:

ext/aubioproxy.c: fix windows c89 compilation

File:

• python/ext/aubioproxy.c (modified) (5 diffs)

python/ext/aubioproxy.c

@@ -22 +22 @@
 int
 PyAubio_IsValidVector (PyObject * input) {
+  npy_intp length;
   if (input == NULL) {
     PyErr_SetString (PyExc_ValueError, "input array is not a python object");
@@ -47 +48 @@
     }
 
-    npy_intp length = PyArray_SIZE ((PyArrayObject *)input);
+    length = PyArray_SIZE ((PyArrayObject *)input);
     if (length <= 0) {
       PyErr_SetString (PyExc_ValueError, "input array size should be greater than 0");
@@ -94 +95 @@
 int
 PyAubio_ArrayToCFmat (PyObject *input, fmat_t *mat) {
-  uint_t i;
+  uint_t i, new_height;
+  npy_intp length, height;
   if (input == NULL) {
     PyErr_SetString (PyExc_ValueError, "input array is not a python object");
@@ -121 +123 @@
 
     // no need to really allocate fvec, just its struct member
-    npy_intp length = PyArray_DIM ((PyArrayObject *)input, 1);
+    length = PyArray_DIM ((PyArrayObject *)input, 1);
     if (length <= 0) {
       PyErr_SetString (PyExc_ValueError, "input array dimension 1 should be greater than 0");
       return 0;
     }
-    npy_intp height = PyArray_DIM ((PyArrayObject *)input, 0);
+    height = PyArray_DIM ((PyArrayObject *)input, 0);
     if (height <= 0) {
       PyErr_SetString (PyExc_ValueError, "input array dimension 0 should be greater than 0");
@@ -140 +142 @@
   }
 
-  uint_t new_height = (uint_t)PyArray_DIM ((PyArrayObject *)input, 0);
+  new_height = (uint_t)PyArray_DIM ((PyArrayObject *)input, 0);
   if (mat->height != new_height) {
     if (mat->data) {