Remove the IN_CLUSTER() macro

diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh
index bc08a25..86e30de 100644 (file)
--- a/src/hb-buffer-private.hh
+++ b/src/hb-buffer-private.hh
@@ -161,7 +161,6 @@ struct _hb_buffer_t {
 #define IN_CURGLYPH()          (BUFFER->in_string[BUFFER->in_pos].codepoint)
 #define IN_NEXTGLYPH()         (BUFFER->in_string[BUFFER->in_pos + 1].codepoint)
 #define IN_CURINFO()           (&BUFFER->in_string[BUFFER->in_pos])
-#define IN_CLUSTER(pos)                (BUFFER->in_string[(pos)].cluster)
 
 HB_END_DECLS
 

diff --git a/src/hb-shape.cc b/src/hb-shape.cc
index f458db2..e8ebf70 100644 (file)
--- a/src/hb-shape.cc
+++ b/src/hb-shape.cc
@@ -51,7 +51,7 @@ hb_form_clusters (hb_buffer_t *buffer)
   count = buffer->in_length;
   for (buffer->in_pos = 1; buffer->in_pos < count; buffer->in_pos++)
     if (buffer->unicode->get_general_category (IN_CURGLYPH()) == HB_CATEGORY_NON_SPACING_MARK)
-      IN_CLUSTER (buffer->in_pos) = IN_CLUSTER (buffer->in_pos - 1);
+      buffer->in_string[buffer->in_pos].cluster = buffer->in_string[buffer->in_pos - 1].cluster;
 }
 
 static hb_direction_t