[cairo-commit] src/cairo-type1-subset.c

[Brian Ewins]

 src/cairo-type1-subset.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
diff-tree 8132b8b417c75388ce4c4671fffddaa44a5d1be0 (from 6020f67f1a49cfe3844c4938d4af24c63c8424cc)
Author: Brian Ewins <Brian.Ewins at gmail.com>
Date:   Sun Sep 23 02:52:01 2007 +0100

    [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.

diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
index 919b1d5..0716005 100644
--- a/src/cairo-type1-subset.c
+++ b/src/cairo-type1-subset.c
@@ -1203,6 +1203,8 @@ _cairo_type1_scaled_font_is_type1 (cairo
     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)