From e88e14421a33ca5bdfd76bc0b2f801fcb6e78911 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 8 Jun 2012 20:55:21 -0400 Subject: [PATCH] Use merge_clusters instead of open-coding --- src/hb-buffer.cc | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/hb-buffer.cc b/src/hb-buffer.cc index 8ccfea5f3..34d2300fb 100644 --- a/src/hb-buffer.cc +++ b/src/hb-buffer.cc @@ -237,13 +237,9 @@ hb_buffer_t::replace_glyphs_be16 (unsigned int num_in, { if (!make_room_for (num_in, num_out)) return; - hb_glyph_info_t orig_info = info[idx]; - for (unsigned int i = 1; i < num_in; i++) - { - hb_glyph_info_t *inf = &info[idx + i]; - orig_info.cluster = MIN (orig_info.cluster, inf->cluster); - } + merge_clusters (idx, idx + num_in); + hb_glyph_info_t orig_info = info[idx]; hb_glyph_info_t *pinfo = &out_info[out_len]; const unsigned char *data = (const unsigned char *) glyph_data_be; for (unsigned int i = 0; i < num_out; i++) @@ -264,13 +260,9 @@ hb_buffer_t::replace_glyphs (unsigned int num_in, { if (!make_room_for (num_in, num_out)) return; - hb_glyph_info_t orig_info = info[idx]; - for (unsigned int i = 1; i < num_in; i++) - { - hb_glyph_info_t *inf = &info[idx + i]; - orig_info.cluster = MIN (orig_info.cluster, inf->cluster); - } + merge_clusters (idx, idx + num_in); + hb_glyph_info_t orig_info = info[idx]; hb_glyph_info_t *pinfo = &out_info[out_len]; for (unsigned int i = 0; i < num_out; i++) {