Changeset bb4af3a

Timestamp:

May 12, 2016, 1:27:42 AM (8 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:

911c22f

Parents:

770f7b4

git-author:

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

git-committer:

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

Message:

python/ext/{aubioproxy,py-cvec}.c: use npy_intp, not long

Location:

python/ext

Files:

• aubioproxy.c (modified) (2 diffs)
• py-cvec.c (modified) (2 diffs)

python/ext/aubioproxy.c

@@ -47 +47 @@
     }
 
-    long length = PyArray_SIZE ((PyArrayObject *)input);
+    npy_intp length = PyArray_SIZE ((PyArrayObject *)input);
     if (length <= 0) {
       PyErr_SetString (PyExc_ValueError, "input array size should be greater than 0");
@@ -121 +121 @@
 
     // no need to really allocate fvec, just its struct member
-    long length = PyArray_DIM ((PyArrayObject *)input, 1);
+    npy_intp length = PyArray_DIM ((PyArrayObject *)input, 1);
     if (length <= 0) {
       PyErr_SetString (PyExc_ValueError, "input array dimension 1 should be greater than 0");
       return 0;
     }
-    long height = PyArray_DIM ((PyArrayObject *)input, 0);
+    npy_intp height = PyArray_DIM ((PyArrayObject *)input, 0);
     if (height <= 0) {
       PyErr_SetString (PyExc_ValueError, "input array dimension 0 should be greater than 0");

python/ext/py-cvec.c

@@ -144 +144 @@
     return 1;
   }
-  long length = PyArray_SIZE ((PyArrayObject *)input);
+  npy_intp length = PyArray_SIZE ((PyArrayObject *)input);
   if (length != vec->length) {
     PyErr_Format (PyExc_ValueError,
@@ -164 +164 @@
     return 1;
   }
-  long length = PyArray_SIZE ((PyArrayObject *)input);
+  npy_intp length = PyArray_SIZE ((PyArrayObject *)input);
   if (length != vec->length) {
     PyErr_Format (PyExc_ValueError,