diff options
-rw-r--r-- | ndarray.h | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -45,13 +45,13 @@ typedef struct NDArray { #define NDARRAY_ALLOC_ZERO (1 << 0) -#define NDIDX1D(arr, x) (arr->stride[0] * x) -#define NDIDX2D(arr, x, y) (arr->stride[0] * y + arr->stride[1] * x) -#define NDIDX3D(arr, x, y, z) (arr->stride[0] * z + arr->stride[1] * y + arr->stride[0] * x) +#define NDIDX1D(arr, x) ((arr)->stride[0] * (x)) +#define NDIDX2D(arr, x, y) ((arr)->stride[0] * (y) + (arr)->stride[1] * (x)) +#define NDIDX3D(arr, x, y, z) ((arr)->stride[0] * (z) + (arr)->stride[1] * (y) + (arr)->stride[0] * (x)) -#define NDPTR1D(arr, x) (arr->data + NDIDX1D(arr, x)) -#define NDPTR2D(arr, x, y) (arr->data + NDIDX2D(arr, x, y)) -#define NDPTR3D(arr, x, y, z) (arr->data + NDIDX2D(arr, x, y, z)) +#define NDPTR1D(arr, x) ((arr)->data + NDIDX1D(arr, x)) +#define NDPTR2D(arr, x, y) ((arr)->data + NDIDX2D(arr, x, y)) +#define NDPTR3D(arr, x, y, z) ((arr)->data + NDIDX2D(arr, x, y, z)) int mg2di_ndarray_alloc(NDArray **result, unsigned int dims, const size_t * const size, unsigned int flags); |