summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2019-04-24 14:42:15 +0200
committerAnton Khirnov <anton@khirnov.net>2019-04-24 14:42:44 +0200
commit580740356c44658620bff6f9ddd8a006f04c31fc (patch)
tree02c44de4803a724bd76c7bd4ddfc1dc6cdf87f17
parentb1e72ea506ddac2d353cfedf2536372b302fabdd (diff)
ndarray: add proper argument parenthetisation in macros
-rw-r--r--ndarray.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/ndarray.h b/ndarray.h
index 42cb64f..db58254 100644
--- a/ndarray.h
+++ b/ndarray.h
@@ -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);