diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-05-11 08:22:20 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-05-11 08:22:20 +0000 |
| commit | f0f38b3ab2fd9e9a8debe35db71156afc01b5d8c (patch) | |
| tree | 77fc322e6198986ffc06378a21019eccb3e4c7ce /pango/pangoxft-fontmap.c | |
| parent | 0a7f8d6fb481d2bd502b5f376a0dcef6f82ee0ff (diff) | |
| download | pango-f0f38b3ab2fd9e9a8debe35db71156afc01b5d8c.tar.gz | |
Update docs to note a size value of zero may have been set explicitly.
2006-05-11 Behdad Esfahbod <behdad@gnome.org>
* pango/fonts.c (pango_font_description_set_size): Update docs to note
a size value of zero may have been set explicitly.
* pango/pango-context.c (pango_context_load_font): Don't warn if font
size if zero.
* pango/pangoatsui-fontmap.c (pango_atsui_font_map_load_font):
* pango/pangox-fontmap.c (pango_x_font_map_load_font): Don't return if
size is zero (probably will fail with no fonts found.)
* pango/pangoxft-fontmap.c (pango_xft_font_map_default_substitute):
* Xft
chokes on size zero. Reassing PIXEL_SIZE to 1.0 if it's zero.
Diffstat (limited to 'pango/pangoxft-fontmap.c')
| -rw-r--r-- | pango/pangoxft-fontmap.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c index 7a15e49b..a033268c 100644 --- a/pango/pangoxft-fontmap.c +++ b/pango/pangoxft-fontmap.c @@ -354,11 +354,19 @@ pango_xft_font_map_default_substitute (PangoFcFontMap *fcfontmap, FcPattern *pattern) { PangoXftFontMap *xftfontmap = PANGO_XFT_FONT_MAP (fcfontmap); + double d; FcConfigSubstitute (NULL, pattern, FcMatchPattern); if (xftfontmap->substitute_func) xftfontmap->substitute_func (pattern, xftfontmap->substitute_data); XftDefaultSubstitute (xftfontmap->display, xftfontmap->screen, pattern); + if (FcPatternGetDouble (pattern, FC_PIXEL_SIZE, 0, &d) == FcResultMatch && d == 0.0) + { + FcValue v; + v.type = FcTypeDouble; + v.u.d = 1.0; + FcPatternAdd (pattern, FC_PIXEL_SIZE, v, FcFalse); + } } static PangoFcFont * |