diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-07-21 05:37:47 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-07-21 05:37:47 +0000 |
| commit | 956ddcff78a3273c45cb4afe6fa1a2bfb5e5fed9 (patch) | |
| tree | e746eff55bc212b7d33401ca4f36dd173c8a5bcb | |
| parent | bf58af82ac685fc62cdf8f51308806db85f25563 (diff) | |
| download | numpy-956ddcff78a3273c45cb4afe6fa1a2bfb5e5fed9.tar.gz | |
Fix whitespace issues.
| -rw-r--r-- | numpy/core/include/numpy/_neighborhood_iterator_imp.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/numpy/core/include/numpy/_neighborhood_iterator_imp.h b/numpy/core/include/numpy/_neighborhood_iterator_imp.h index 809598caa..8e3e055ec 100644 --- a/numpy/core/include/numpy/_neighborhood_iterator_imp.h +++ b/numpy/core/include/numpy/_neighborhood_iterator_imp.h @@ -81,7 +81,7 @@ _PyArrayNeighborhoodIter_SetPtrConstant(PyArrayNeighborhoodIterObject* iter) int i; npy_intp offset, bd; - assert((iter->mode == NPY_NEIGHBORHOOD_ITER_ONE_PADDING) + assert((iter->mode == NPY_NEIGHBORHOOD_ITER_ONE_PADDING) | (iter->mode == NPY_NEIGHBORHOOD_ITER_ZERO_PADDING) | (iter->mode == NPY_NEIGHBORHOOD_ITER_CONSTANT_PADDING)); @@ -166,14 +166,13 @@ _PyArrayNeighborhoodIter_SetPtrMirror(PyArrayNeighborhoodIterObject* iter) /* compute l such as i = k * n + l, 0 <= l < |k| */ static NPY_INLINE npy_intp _npy_euclidean_division(npy_intp i, npy_intp n) { - npy_intp l; + npy_intp l; - l = i % n; - - if (l < 0) { - l += n; - } - return l; + l = i % n; + if (l < 0) { + l += n; + } + return l; } #define _INF_SET_PTR_CIRCULAR(c) \ bd = iter->coordinates[c] + iter->_internal_iter->coordinates[c]; \ @@ -204,7 +203,7 @@ _PyArrayNeighborhoodIter_SetPtrCircular(PyArrayNeighborhoodIterObject* iter) static NPY_INLINE int PyArrayNeighborhoodIter_Next2D(PyArrayNeighborhoodIterObject* iter) { - assert((iter->mode == NPY_NEIGHBORHOOD_ITER_ONE_PADDING) + assert((iter->mode == NPY_NEIGHBORHOOD_ITER_ONE_PADDING) | (iter->mode == NPY_NEIGHBORHOOD_ITER_ZERO_PADDING) | (iter->mode == NPY_NEIGHBORHOOD_ITER_CONSTANT_PADDING)); assert(iter->nd == 2); @@ -218,7 +217,7 @@ PyArrayNeighborhoodIter_Next2D(PyArrayNeighborhoodIterObject* iter) static NPY_INLINE int PyArrayNeighborhoodIter_NextConstant(PyArrayNeighborhoodIterObject* iter) { - assert((iter->mode == NPY_NEIGHBORHOOD_ITER_ONE_PADDING) + assert((iter->mode == NPY_NEIGHBORHOOD_ITER_ONE_PADDING) | (iter->mode == NPY_NEIGHBORHOOD_ITER_ZERO_PADDING) | (iter->mode == NPY_NEIGHBORHOOD_ITER_CONSTANT_PADDING)); @@ -278,7 +277,7 @@ PyArrayNeighborhoodIter_ResetConstant(PyArrayNeighborhoodIterObject* iter) { int i; - assert((iter->mode == NPY_NEIGHBORHOOD_ITER_ONE_PADDING) + assert((iter->mode == NPY_NEIGHBORHOOD_ITER_ONE_PADDING) | (iter->mode == NPY_NEIGHBORHOOD_ITER_ZERO_PADDING) | (iter->mode == NPY_NEIGHBORHOOD_ITER_CONSTANT_PADDING)); |