diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-01-09 00:12:39 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-01-09 00:12:39 +0000 |
| commit | cc6ac36dd3c7e5ef39b9f21ef77596a159f2100e (patch) | |
| tree | e1b8ffc1c14d449a41946d22ea5d1c6ddf9115d8 /pango/pangoft2.c | |
| parent | 75f4ad29adce645ddb837e662c9d71ccfbf60154 (diff) | |
| download | pango-cc6ac36dd3c7e5ef39b9f21ef77596a159f2100e.tar.gz | |
Add checks for Cairo
Sat Jan 8 16:46:37 2005 Owen Taylor <otaylor@redhat.com>
* configure.in: Add checks for Cairo
* pango/Makefile.am: Add libpangocairo.
* pango/pangocairo-font.c pango/pangocairo-fontmap.c
pango/pangocairo.h pango/pangocairo-private.h
pango/pangocairo-fcfont.c pango/pangocairo-fcfontmap.c
pango/pangocairo-fc.h: Start of a Cairo/FreeType backend.
* pango/pangofc-fontmap.[ch]: Add a "get_render_key"
virtual function to allow subclasses to specialize the
details of how caching works. Add a default implementation
that's a little more sophisticated than what was there
before.
* pango/pangoft2-private.h pangofc-font.c pangoft2.c:
Move default implementations of has_char(), get_glyph()
to the base class.
* pango/pangofc-private.h pango/pangoft2-private.h:
Move PANGO_UNITS_26_6 and friends to pango/pangofc-private.h.
* examples/renderdemo.[ch] examples/pangoft2topgm.c
examples/xftview.c: Allow passing in a custom function
to transform drawing.
* examples/Makefile.am examples/cairoview.c: Add a
Cairo/Xlib example program.
* examples/cairosimple.c: Simple Cairo example with
output to a PNG.
* pango/pango-layout.c (pango_layout_line_get_extents): Fix
bug where line ink rect was always including 0, 0.
Diffstat (limited to 'pango/pangoft2.c')
| -rw-r--r-- | pango/pangoft2.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/pango/pangoft2.c b/pango/pangoft2.c index d0c35358..75168307 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -58,10 +58,6 @@ static void pango_ft2_font_get_glyph_extents (PangoFont * static FT_Face pango_ft2_font_real_lock_face (PangoFcFont *font); static void pango_ft2_font_real_unlock_face (PangoFcFont *font); -static gboolean pango_ft2_font_real_has_char (PangoFcFont *font, - gunichar wc); -static guint pango_ft2_font_real_get_glyph (PangoFcFont *font, - gunichar wc); static PangoGlyph pango_ft2_font_real_get_unknown_glyph (PangoFcFont *font, gunichar wc); @@ -263,8 +259,6 @@ pango_ft2_font_class_init (PangoFT2FontClass *class) fc_font_class->lock_face = pango_ft2_font_real_lock_face; fc_font_class->unlock_face = pango_ft2_font_real_unlock_face; - fc_font_class->has_char = pango_ft2_font_real_has_char; - fc_font_class->get_glyph = pango_ft2_font_real_get_glyph; fc_font_class->get_unknown_glyph = pango_ft2_font_real_get_unknown_glyph; } @@ -366,34 +360,6 @@ pango_ft2_font_real_unlock_face (PangoFcFont *font) { } -static gboolean -pango_ft2_font_real_has_char (PangoFcFont *font, - gunichar wc) -{ - FcCharSet *charset; - - if (FcPatternGetCharSet (font->font_pattern, - FC_CHARSET, 0, &charset) != FcResultMatch) - return FALSE; - - return FcCharSetHasChar (charset, wc); -} - -static guint -pango_ft2_font_real_get_glyph (PangoFcFont *font, - gunichar wc) -{ - FT_Face face; - FT_UInt index; - - face = pango_ft2_font_get_face ((PangoFont *)font); - index = FcFreeTypeCharIndex (face, wc); - if (index && index <= face->num_glyphs) - return index; - - return 0; -} - static PangoGlyph pango_ft2_font_real_get_unknown_glyph (PangoFcFont *font, gunichar wc) |