[pango/kill-shape-engines-2: 3/9] Use pango_font_covers
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/kill-shape-engines-2: 3/9] Use pango_font_covers
- Date: Wed, 10 Jul 2019 12:01:24 +0000 (UTC)
commit 9e4d09f418d76b9f9c084971ab948fe6b3bc9128
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Jul 9 14:53:15 2019 -0400
Use pango_font_covers
This replaces all uses of _pango_engine_shape_covers.
pango/ellipsize.c | 7 ++++---
pango/pango-context.c | 4 +---
2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/pango/ellipsize.c b/pango/ellipsize.c
index ade33ec7..4446566b 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,9 @@ 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,
+ item->analysis.language,
+ g_utf8_get_char (ellipsis_text)))
{
pango_item_free (item);
diff --git a/pango/pango-context.c b/pango/pango-context.c
index b8e78c22..62ffc6e2 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->lang, info->wc);
if (level != PANGO_COVERAGE_NONE)
{
info->font = font;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]