diff options
Diffstat (limited to 'pango/pangofc-fontmap.c')
| -rw-r--r-- | pango/pangofc-fontmap.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index aada1909..62f2cd4b 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -2538,9 +2538,9 @@ _pango_fc_font_map_fc_to_languages (FcLangSet *langset) FcStrSet *strset; FcStrList *list; FcChar8 *s; - GArray *langs; + GPtrArray *langs; - langs = g_array_new (TRUE, FALSE, sizeof (PangoLanguage *)); + langs = g_ptr_array_new (); strset = FcLangSetGetLangs (langset); list = FcStrListCreate (strset); @@ -2549,13 +2549,15 @@ _pango_fc_font_map_fc_to_languages (FcLangSet *langset) while ((s = FcStrListNext (list))) { PangoLanguage *l = pango_language_from_string ((const char *)s); - g_array_append_val (langs, l); + g_ptr_array_add (langs, l); } FcStrListDone (list); FcStrSetDestroy (strset); - return (PangoLanguage **) g_array_free (langs, FALSE); + g_ptr_array_add (langs, NULL); + + return (PangoLanguage **) g_ptr_array_free (langs, FALSE); } PangoLanguage ** @@ -3389,9 +3391,6 @@ pango_fc_font_map_get_hb_face (PangoFcFontMap *fcfontmap, { hb_blob_t *blob; - if (!hb_version_atleast (2, 0, 0)) - g_error ("Harfbuzz version too old (%s)\n", hb_version_string ()); - blob = hb_blob_create_from_file (data->filename); data->hb_face = hb_face_create (blob, data->id); hb_blob_destroy (blob); |