summaryrefslogtreecommitdiff
path: root/pango/pango-ot-info.c
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2009-11-04 17:01:14 -0500
committerBehdad Esfahbod <behdad@behdad.org>2009-11-04 17:01:14 -0500
commit9aad0832bbe7b979a0f7161b1074c9213b1cbe35 (patch)
treec5b2b4f021bc59e6c857cbfbc375acd2a409620d /pango/pango-ot-info.c
parent1a9072ec14c2d57a53c90746e182884453e08957 (diff)
downloadpango-9aad0832bbe7b979a0f7161b1074c9213b1cbe35.tar.gz
Update to new HarfBuzz query API
Diffstat (limited to 'pango/pango-ot-info.c')
-rw-r--r--pango/pango-ot-info.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/pango/pango-ot-info.c b/pango/pango-ot-info.c
index c06065d2..97d37a1d 100644
--- a/pango/pango-ot-info.c
+++ b/pango/pango-ot-info.c
@@ -452,11 +452,11 @@ pango_ot_info_list_scripts (PangoOTInfo *info,
{
hb_tag_t tt = get_hb_table_type (table_type);
PangoOTTag *result;
- unsigned int count = 0;
+ unsigned int count;
- hb_ot_layout_table_get_script_tags (info->hb_face, tt, &count, NULL);
+ count = hb_ot_layout_table_get_script_tags (info->hb_face, tt, 0, NULL, NULL);
result = g_new (PangoOTTag, count + 1);
- hb_ot_layout_table_get_script_tags (info->hb_face, tt, &count, result);
+ hb_ot_layout_table_get_script_tags (info->hb_face, tt, 0, &count, result);
result[count] = 0;
return result;
@@ -482,11 +482,11 @@ pango_ot_info_list_languages (PangoOTInfo *info,
{
hb_tag_t tt = get_hb_table_type (table_type);
PangoOTTag *result;
- unsigned int count = 0;
+ unsigned int count;
- hb_ot_layout_script_get_language_tags (info->hb_face, tt, script_index, &count, NULL);
+ count = hb_ot_layout_script_get_language_tags (info->hb_face, tt, script_index, 0, NULL, NULL);
result = g_new (PangoOTTag, count + 1);
- hb_ot_layout_script_get_language_tags (info->hb_face, tt, script_index, &count, result);
+ hb_ot_layout_script_get_language_tags (info->hb_face, tt, script_index, 0, &count, result);
result[count] = 0;
return result;
@@ -516,11 +516,11 @@ pango_ot_info_list_features (PangoOTInfo *info,
{
hb_tag_t tt = get_hb_table_type (table_type);
PangoOTTag *result;
- unsigned int count = 0;
+ unsigned int count;
- hb_ot_layout_language_get_feature_tags (info->hb_face, tt, script_index, language_index, &count, NULL);
+ count = hb_ot_layout_language_get_feature_tags (info->hb_face, tt, script_index, language_index, 0, NULL, NULL);
result = g_new (PangoOTTag, count + 1);
- hb_ot_layout_language_get_feature_tags (info->hb_face, tt, script_index, language_index, &count, result);
+ hb_ot_layout_language_get_feature_tags (info->hb_face, tt, script_index, language_index, 0, &count, result);
result[count] = 0;
return result;
@@ -548,10 +548,10 @@ _pango_ot_info_substitute (const PangoOTInfo *info,
hb_ot_layout_feature_get_lookup_indexes (info->hb_face,
HB_OT_TAG_GSUB,
rule->feature_index,
+ 0,
&lookup_count,
lookup_indexes);
- lookup_count = MIN (G_N_ELEMENTS (lookup_indexes), lookup_count);
for (j = 0; j < lookup_count; j++)
hb_ot_layout_substitute_lookup (info->hb_face,
buffer->buffer,
@@ -596,10 +596,10 @@ _pango_ot_info_position (const PangoOTInfo *info,
hb_ot_layout_feature_get_lookup_indexes (info->hb_face,
HB_OT_TAG_GPOS,
rule->feature_index,
+ 0,
&lookup_count,
lookup_indexes);
- lookup_count = MIN (G_N_ELEMENTS (lookup_indexes), lookup_count);
for (j = 0; j < lookup_count; j++)
hb_ot_layout_position_lookup (info->hb_face, hb_font,
buffer->buffer,