diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:38 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:38 +0100 |
| commit | d0ca838c7ab297036b4a7c45351761a48fe05efd (patch) | |
| tree | f0f3cc006e8157d6bd699bd644b7dd7b35387ac2 /app/wlib/gtklib/font.c | |
| parent | fd6639655b399a79fb72f494786a4f57da9c90e7 (diff) | |
| parent | 5d2c2b27a6323e2666378b986129b2a7c2c39e5c (diff) | |
Update upstream source from tag 'upstream/5.2.2GA'
Update to upstream version '5.2.2GA'
with Debian dir 9c80045d0b4f9e463647bc8af8c090a673df4132
Diffstat (limited to 'app/wlib/gtklib/font.c')
| -rw-r--r-- | app/wlib/gtklib/font.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/app/wlib/gtklib/font.c b/app/wlib/gtklib/font.c index e2f741b..29df04d 100644 --- a/app/wlib/gtklib/font.c +++ b/app/wlib/gtklib/font.c @@ -182,11 +182,11 @@ PangoLayout *wlibFontCreatePangoLayout(GtkWidget *widget, wFont_p fp, wFontSize_t fs, const char *s, - int *width_p, - int *height_p, - int *ascent_p, - int *descent_p, - int *baseline_p) + wDrawPix_t *width_p, + wDrawPix_t *height_p, + wDrawPix_t *ascent_p, + wDrawPix_t *descent_p, + wDrawPix_t *baseline_p) { if (!fontInitted) { fontInit(); @@ -215,9 +215,10 @@ PangoLayout *wlibFontCreatePangoLayout(GtkWidget *widget, FONTSIZE_TO_PANGOSIZE(fs) * PANGO_SCALE); pango_layout_set_font_description(layout, fontDescription); /* get layout measures */ - pango_layout_get_size(layout, width_p, height_p); - *width_p = *width_p / PANGO_SCALE; - *height_p = *height_p / PANGO_SCALE; + gint width_i, height_i; + pango_layout_get_size(layout, &width_i, &height_i); + *width_p = width_i / PANGO_SCALE; + *height_p = height_i / PANGO_SCALE; context = gtk_widget_create_pango_context(widget); metrics = pango_context_get_metrics(context, fontDescription, pango_context_get_language(context)); |