diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2018-07-16 00:56:11 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2018-07-16 00:56:11 +0000 |
| commit | d403624bf112a49991e903cfd236f0f1ff653cdf (patch) | |
| tree | 7c6b47be0bb4008461e4c836521e4d679a0bd40e /pango/pangofc-fontmap.c | |
| parent | 0814dec8b7765e472dca4e6d695f70c39976aec1 (diff) | |
| parent | bd06f7b94e563f276550cb81c3a0e5612c88c314 (diff) | |
| download | pango-wip/chergert/bidi-temp-allocs.tar.gz | |
Merge branch 'master' into 'wip/chergert/bidi-temp-allocs'wip/chergert/bidi-temp-allocs
# Conflicts:
# pango/pango-bidi-type.c
Diffstat (limited to 'pango/pangofc-fontmap.c')
| -rw-r--r-- | pango/pangofc-fontmap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index cc4694d2..97a07307 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -2410,13 +2410,15 @@ pango_fc_face_list_sizes (PangoFontFace *face, { GArray *size_array; double size, dpi = -1.0; - int i, size_i; + int i, size_i, j; size_array = g_array_new (FALSE, FALSE, sizeof (int)); for (i = 0; i < fontset->nfont; i++) { - if (FcPatternGetDouble (fontset->fonts[i], FC_PIXEL_SIZE, 0, &size) == FcResultMatch) + for (j = 0; + FcPatternGetDouble (fontset->fonts[i], FC_PIXEL_SIZE, j, &size) == FcResultMatch; + j++) { if (dpi < 0) dpi = pango_fc_font_map_get_resolution (fcface->family->fontmap, NULL); |