diff options
| author | Sebastian Berg <sebastian@sipsolutions.net> | 2013-11-24 22:35:11 +0100 |
|---|---|---|
| committer | Sebastian Berg <sebastian@sipsolutions.net> | 2014-02-06 17:51:59 +0100 |
| commit | b1f8e29dfe87c886f546699ced509df7027bb0dd (patch) | |
| tree | 6c5acab0e9cdf4feb0c388ad84d982f2d8f86dcf | |
| parent | 1e647c595dc6e4d5dec4b0a3ecf136b33ae89627 (diff) | |
| download | numpy-b1f8e29dfe87c886f546699ced509df7027bb0dd.tar.gz | |
STY: mapping.c minor style fixes
| -rw-r--r-- | numpy/core/src/multiarray/mapping.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c index 83bed3a2e..6681e1203 100644 --- a/numpy/core/src/multiarray/mapping.c +++ b/numpy/core/src/multiarray/mapping.c @@ -883,13 +883,14 @@ get_view_from_index(PyArrayObject *self, PyArrayObject **view, int orig_dim = 0; char *data_ptr = PyArray_BYTES(self); - npy_intp start, stop, step, n_steps; /* for slice parsing */ + /* for slice parsing */ + npy_intp start, stop, step, n_steps; for (i=0; i < index_num; i++) { switch (indices[i].type) { case HAS_INTEGER: if ((check_and_adjust_index(&indices[i].value, - PyArray_DIMS(self)[orig_dim], i)) < 0) { + PyArray_DIMS(self)[orig_dim], orig_dim)) < 0) { return -1; } data_ptr += PyArray_STRIDE(self, orig_dim) * indices[i].value; @@ -910,8 +911,7 @@ get_view_from_index(PyArrayObject *self, PyArrayObject **view, PyArray_DIMS(self)[orig_dim], &start, &stop, &step, &n_steps) < 0) { if (!PyErr_Occurred()) { - PyErr_SetString(PyExc_IndexError, - "invalid slice"); + PyErr_SetString(PyExc_IndexError, "invalid slice"); } return -1; } |