summaryrefslogtreecommitdiff
path: root/pango/itemize.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2022-08-28 13:34:48 +0000
committerMatthias Clasen <mclasen@redhat.com>2022-08-28 13:34:48 +0000
commiteb973b9bdfd11467f63f1626f16d5d4005eb82a7 (patch)
treec19e9caf133b53f97ad8f155129eaef068009b19 /pango/itemize.c
parenta3517dcc6de9bae1193075b7112aa7db97b39dcc (diff)
parentda5b42263675acc7e615b8893a3a716646e910db (diff)
downloadpango-eb973b9bdfd11467f63f1626f16d5d4005eb82a7.tar.gz
Merge branch 'strdup-avoidance' into 'main'
fc: Avoid extra copies of family names See merge request GNOME/pango!636
Diffstat (limited to 'pango/itemize.c')
-rw-r--r--pango/itemize.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/pango/itemize.c b/pango/itemize.c
index 728ad7d9..cf9d6a8f 100644
--- a/pango/itemize.c
+++ b/pango/itemize.c
@@ -1296,17 +1296,10 @@ variant_supported (PangoItem *item,
static PangoVariant
get_font_variant (PangoItem *item)
{
- PangoFontDescription *desc;
- PangoVariant variant = PANGO_VARIANT_NORMAL;
-
if (item->analysis.font)
- {
- desc = pango_font_describe (item->analysis.font);
- variant = pango_font_description_get_variant (desc);
- pango_font_description_free (desc);
- }
+ return pango_font_get_variant (item->analysis.font);
- return variant;
+ return PANGO_VARIANT_NORMAL;
}
static PangoTextTransform