diff options
| author | Brian Ewins <Brian.Ewins@gmail.com> | 2007-09-23 02:52:01 +0100 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2007-11-26 21:24:45 -0800 |
| commit | 4e2a11e0f10702abd5c5144410530e10d1e20a5d (patch) | |
| tree | 1298a31420014323e1b9c980656fc77d96fb01d6 /src | |
| parent | d672c26396f6bde7a771beb5d35b3b786c4574b4 (diff) | |
[type1-subset] only subset ft fonts
If atsui and ft were both enabled, the code crashed trying to subset
type-1 fonts; fixed by checking if fonts really are ft before using
them as ft fonts. This is a temporary fix until we support subsetting
across all font backends.
(cherry picked from commit 8132b8b417c75388ce4c4671fffddaa44a5d1be0)
Diffstat (limited to 'src')
| -rw-r--r-- | src/cairo-type1-subset.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c index 919b1d5c7..0716005bc 100644 --- a/src/cairo-type1-subset.c +++ b/src/cairo-type1-subset.c @@ -1203,6 +1203,8 @@ _cairo_type1_scaled_font_is_type1 (cairo_scaled_font_t *scaled_font) PS_FontInfoRec font_info; cairo_bool_t is_type1 = FALSE; + if (!_cairo_scaled_font_is_ft (scaled_font)) + return FALSE; unscaled = (cairo_ft_unscaled_font_t *) _cairo_ft_scaled_font_get_unscaled_font (scaled_font); face = _cairo_ft_unscaled_font_lock_face (unscaled); if (!face) |