From 315d5c91c89fb41eec64d00b42e38eb2117fbfa4 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 19 Apr 2011 00:37:56 -0400 Subject: [PATCH] Update to HarfBuzz API changes --- modules/basic/basic-fc.c | 4 ++-- pango/pango-ot-buffer.c | 9 ++++----- pango/pango-ot-info.c | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c index 27112f9..9010ab6 100644 --- a/modules/basic/basic-fc.c +++ b/modules/basic/basic-fc.c @@ -279,8 +279,8 @@ basic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED, /* buffer output */ num_glyphs = hb_buffer_get_length (hb_buffer); - hb_glyph = hb_buffer_get_glyph_infos (hb_buffer); - hb_position = hb_buffer_get_glyph_positions (hb_buffer); + hb_glyph = hb_buffer_get_glyph_infos (hb_buffer, NULL); + hb_position = hb_buffer_get_glyph_positions (hb_buffer, NULL); pango_glyph_string_set_size (glyphs, num_glyphs); last_cluster = -1; for (i = 0; i < num_glyphs; i++) diff --git a/pango/pango-ot-buffer.c b/pango/pango-ot-buffer.c index 2dc4a1c..186bfd4 100644 --- a/pango/pango-ot-buffer.c +++ b/pango/pango-ot-buffer.c @@ -148,8 +148,7 @@ pango_ot_buffer_add_glyph (PangoOTBuffer *buffer, guint properties, guint cluster) { - hb_buffer_add_glyph (buffer->buffer, - glyph, ~properties, cluster); + hb_buffer_add (buffer->buffer, glyph, ~properties, cluster); } /** @@ -209,7 +208,7 @@ pango_ot_buffer_get_glyphs (const PangoOTBuffer *buffer, int *n_glyphs) { if (glyphs) - *glyphs = (PangoOTGlyph *) hb_buffer_get_glyph_infos (buffer->buffer); + *glyphs = (PangoOTGlyph *) hb_buffer_get_glyph_infos (buffer->buffer, NULL); if (n_glyphs) *n_glyphs = hb_buffer_get_length (buffer->buffer); @@ -241,8 +240,8 @@ pango_ot_buffer_output (const PangoOTBuffer *buffer, /* Copy glyphs into output glyph string */ num_glyphs = hb_buffer_get_length (hb_buffer); - hb_glyph = hb_buffer_get_glyph_infos (hb_buffer); - hb_position = hb_buffer_get_glyph_positions (hb_buffer); + hb_glyph = hb_buffer_get_glyph_infos (hb_buffer, NULL); + hb_position = hb_buffer_get_glyph_positions (hb_buffer, NULL); pango_glyph_string_set_size (glyphs, num_glyphs); last_cluster = -1; for (i = 0; i < num_glyphs; i++) diff --git a/pango/pango-ot-info.c b/pango/pango-ot-info.c index 9b4382f..79c3cb2 100644 --- a/pango/pango-ot-info.c +++ b/pango/pango-ot-info.c @@ -404,8 +404,8 @@ _pango_ot_info_position (const PangoOTInfo *info, /* Apply default positioning */ num_glyphs = hb_buffer_get_length (buffer->buffer); - hb_glyph = hb_buffer_get_glyph_infos (buffer->buffer); - hb_position = hb_buffer_get_glyph_positions (buffer->buffer); + hb_glyph = hb_buffer_get_glyph_infos (buffer->buffer, NULL); + hb_position = hb_buffer_get_glyph_positions (buffer->buffer, NULL); hb_ot_layout_position_start (buffer->buffer); -- 2.7.4