Changeset 8b7cdba

Timestamp:

Feb 27, 2017, 5:21:34 PM (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, sampler

Children:

fcb6e8c

Parents:

410a157

Message:

python/ext/py-source.c: use PyArray_NewShape, not _Resize

File:

• python/ext/py-source.c (modified) (2 diffs)

python/ext/py-source.c

@@ -311 +311 @@
       return vec;
     } else if (PyLong_AsLong(size) > 0) {
-      // short read
+      // short read, return a shorter array
       PyArrayObject *shortread = (PyArrayObject*)PyTuple_GetItem(done, 0);
       PyArray_Dims newdims;
+      PyObject *reshaped;
       newdims.len = PyArray_NDIM(shortread);
       newdims.ptr = PyArray_DIMS(shortread);
@@ -322 +323 @@
         newdims.ptr[1] = PyLong_AsLong(size);
       }
-      PyArray_Resize(shortread, &newdims, 1, NPY_ANYORDER);
-      return (PyObject*)shortread;
+      reshaped = PyArray_Newshape(shortread, &newdims, NPY_CORDER);
+      Py_DECREF(shortread);
+      return reshaped;
     } else {
       PyErr_SetNone(PyExc_StopIteration);