[pango/userfont: 5/6] Fix up non-user font shaping
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/userfont: 5/6] Fix up non-user font shaping
- Date: Sun, 13 Feb 2022 20:30:50 +0000 (UTC)
commit e05c0ed80a0706176c96fc7958848563a1abb45c
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Jan 30 04:52:28 2022 +0100
Fix up non-user font shaping
pango/shape.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/pango/shape.c b/pango/shape.c
index 1a03ec1e..68d11eee 100644
--- a/pango/shape.c
+++ b/pango/shape.c
@@ -638,14 +638,14 @@ pango_shape_internal (const char *item_text,
g_return_if_fail (paragraph_text <= item_text);
g_return_if_fail (paragraph_text + paragraph_length >= item_text + item_length);
- if (PANGO_IS_HB_FONT (analysis->font))
+ if (PANGO_IS_USER_FONT (analysis->font))
+ pango_user_shape (item_text, item_length, analysis, glyphs, flags);
+ else if (analysis->font)
pango_hb_shape (item_text, item_length,
paragraph_text, paragraph_length,
analysis,
log_attrs, num_chars,
glyphs, flags);
- else if (PANGO_IS_USER_FONT (analysis->font))
- pango_user_shape (item_text, item_length, analysis, glyphs, flags);
else
glyphs->num_glyphs = 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]