[gegl] buffer: rename GEGL_ALIGN => GEGL_ALIGNMENT; add GEGL_ALIGN() macro
- From: Ell <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] buffer: rename GEGL_ALIGN => GEGL_ALIGNMENT; add GEGL_ALIGN() macro
- Date: Tue, 7 May 2019 18:51:59 +0000 (UTC)
commit 9efef7f6fe69e5dbe4688fd99ed537756ef952d0
Author: Ell <ell_se yahoo com>
Date: Tue May 7 12:25:47 2019 -0400
buffer: rename GEGL_ALIGN => GEGL_ALIGNMENT; add GEGL_ALIGN() macro
Rename the GEGL_ALIGN constant (specifying allocated data
alignment) to GEGL_ALIGNMENT, and add a GEGL_ALIGN() macro, which
takes a size/address value and aligns it to GEGL_ALIGN.
gegl/buffer/gegl-memory-private.h | 6 +++++-
gegl/buffer/gegl-memory.c | 6 +++---
gegl/buffer/gegl-scratch.c | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/gegl/buffer/gegl-memory-private.h b/gegl/buffer/gegl-memory-private.h
index 9621e1e12..ca2ef13f7 100644
--- a/gegl/buffer/gegl-memory-private.h
+++ b/gegl/buffer/gegl-memory-private.h
@@ -18,7 +18,11 @@
#define __GEGL_MEMORY_PRIVATE_H__
-#define GEGL_ALIGN 16
+#define GEGL_ALIGNMENT 16
+#define GEGL_ALIGN(n) \
+ (((n) + (GEGL_ALIGNMENT - 1)) / \
+ GEGL_ALIGNMENT * \
+ GEGL_ALIGNMENT)
#endif /* __GEGL_MEMORY_PRIVATE_H__ */
diff --git a/gegl/buffer/gegl-memory.c b/gegl/buffer/gegl-memory.c
index 3d2758ebf..e6e047c68 100644
--- a/gegl/buffer/gegl-memory.c
+++ b/gegl/buffer/gegl-memory.c
@@ -24,7 +24,7 @@
#include "gegl-memory-private.h"
-G_STATIC_ASSERT (GEGL_ALIGN <= G_MAXUINT8);
+G_STATIC_ASSERT (GEGL_ALIGNMENT <= G_MAXUINT8);
/* public functions */
@@ -39,8 +39,8 @@ gegl_malloc (gsize size)
gchar *ret;
gint offset;
- mem = g_malloc (size + GEGL_ALIGN);
- offset = GEGL_ALIGN - GPOINTER_TO_UINT(mem) % GEGL_ALIGN;
+ mem = g_malloc (size + GEGL_ALIGNMENT);
+ offset = GEGL_ALIGNMENT - GPOINTER_TO_UINT(mem) % GEGL_ALIGNMENT;
ret = (gpointer)(mem + offset);
/* store the offset to the real malloc one byte in front of this malloc */
diff --git a/gegl/buffer/gegl-scratch.c b/gegl/buffer/gegl-scratch.c
index b5bfc18e4..083cdc97f 100644
--- a/gegl/buffer/gegl-scratch.c
+++ b/gegl/buffer/gegl-scratch.c
@@ -27,7 +27,7 @@
#include "gegl-scratch-private.h"
-#define GEGL_SCRATCH_ALIGNMENT GEGL_ALIGN
+#define GEGL_SCRATCH_ALIGNMENT GEGL_ALIGNMENT
#define GEGL_SCRATCH_MAX_BLOCK_SIZE (1 << 20)
#define GEGL_SCRATCH_BLOCK_DATA_OFFSET ((sizeof (GeglScratchBlockHeader) + \
(GEGL_SCRATCH_ALIGNMENT - 1)) / \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]