diff options
| -rw-r--r-- | pango/ellipsize.c | 6 | ||||
| -rw-r--r-- | pango/pango-context.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pango/ellipsize.c b/pango/ellipsize.c index ade33ec7..928ec744 100644 --- a/pango/ellipsize.c +++ b/pango/ellipsize.c @@ -24,7 +24,7 @@ #include "pango-glyph-item.h" #include "pango-layout-private.h" -#include "pango-engine-private.h" +#include "pango-font-private.h" #include "pango-impl-utils.h" typedef struct _EllipsizeState EllipsizeState; @@ -345,8 +345,8 @@ shape_ellipsis (EllipsizeState *state) /* If that fails we use "..." in the first matching font */ if (!item->analysis.font || - !_pango_engine_shape_covers (item->analysis.shape_engine, item->analysis.font, - item->analysis.language, g_utf8_get_char (ellipsis_text))) + !pango_font_covers (item->analysis.font, + g_utf8_get_char (ellipsis_text))) { pango_item_free (item); diff --git a/pango/pango-context.c b/pango/pango-context.c index 413119f3..1cb89d4a 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -1247,14 +1247,12 @@ get_font_foreach (PangoFontset *fontset, gpointer data) { GetFontInfo *info = data; - PangoEngineShape *engine; PangoCoverageLevel level; if (G_UNLIKELY (!font)) return FALSE; - engine = pango_font_find_shaper (font, info->lang, info->wc), - level = _pango_engine_shape_covers (engine, font, info->lang, info->wc); + level = pango_font_covers (font, info->wc); if (level != PANGO_COVERAGE_NONE) { info->font = font; |