From dea166a27c22fdac11a92d2194c5c2c2be8cedd8 Mon Sep 17 00:00:00 2001 From: llyyr Date: Sat, 21 Mar 2026 12:09:29 +0530 Subject: [PATCH] common/pango: use pangocairo directly instead of cairo_create(NULL) We never need a cairo context for anything here. Use pango_cairo_font_map_get_default() and pango_font_map_create_context() directly instead of bootstrapping via a nil cairo context. Same as last commit, but just a cosmetic fix in this case since we don't actually use the cairo context for anything --- common/pango.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/pango.c b/common/pango.c index 662b3699e..781d7b312 100644 --- a/common/pango.c +++ b/common/pango.c @@ -123,8 +123,8 @@ out: } void get_text_metrics(const PangoFontDescription *description, int *height, int *baseline) { - cairo_t *cairo = cairo_create(NULL); - PangoContext *pango = pango_cairo_create_context(cairo); + PangoFontMap *fontmap = pango_cairo_font_map_get_default(); + PangoContext *pango = pango_font_map_create_context(fontmap); pango_context_set_round_glyph_positions(pango, false); // When passing NULL as a language, pango uses the current locale. PangoFontMetrics *metrics = pango_context_get_metrics(pango, description, NULL); @@ -134,7 +134,6 @@ void get_text_metrics(const PangoFontDescription *description, int *height, int pango_font_metrics_unref(metrics); g_object_unref(pango); - cairo_destroy(cairo); } void render_text(cairo_t *cairo, const PangoFontDescription *desc,