diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-06-10 00:48:25 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-06-10 00:48:25 +0000 |
| commit | 1bc615b0a5863c5680770171f014a1f99c975a9e (patch) | |
| tree | e7956b3e611ec5867be06bf721b60333edac3798 /pango/pangocairo-render.c | |
| parent | 672cd0f5671ba6f20c76a3b12cfbd4c77c57fb54 (diff) | |
| download | pango-1bc615b0a5863c5680770171f014a1f99c975a9e.tar.gz | |
Bug 337593 – move glyph extents code (and cache) from pangocairo-*font.c
2007-06-09 Behdad Esfahbod <behdad@gnome.org>
Bug 337593 – move glyph extents code (and cache) from
pangocairo-*font.c into pangocairo-font.c
* pango/pangocairo-fontmap.c:
* pango/pangocairo-fcfontmap.c:
Remove per-fontmap renderer. We've not been using it for a while
and there is no reason to use it.
* pango/pangocairo-font.c
* pango/pangocairo-fcfont.c:
Most most code (including glyph extents caching) from fcfont.c to
font.c. Simplifies individual backends a lot. ATSUI and Win32
cairo backends should adapt.
* pango/pangocairo-render.c
* pango/pangocairo-private.h:
Update to reflect above changes.
svn path=/trunk/; revision=2335
Diffstat (limited to 'pango/pangocairo-render.c')
| -rw-r--r-- | pango/pangocairo-render.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pango/pangocairo-render.c b/pango/pangocairo-render.c index 4c0baf29..d14d980d 100644 --- a/pango/pangocairo-render.c +++ b/pango/pangocairo-render.c @@ -128,7 +128,7 @@ _pango_cairo_renderer_draw_unknown_glyph (PangoCairoRenderer *crenderer, int rows, cols; char hexbox_string[2] = {0, 0}; double temp_x, temp_y; - PangoCairoHexBoxInfo *hbi; + PangoCairoFontHexBoxInfo *hbi; gunichar ch; cairo_save (crenderer->cr); @@ -136,7 +136,7 @@ _pango_cairo_renderer_draw_unknown_glyph (PangoCairoRenderer *crenderer, hbi = _pango_cairo_font_get_hex_box_info ((PangoCairoFont *)font); - if (!hbi || !_pango_cairo_font_install ((PangoCairoFont *) (hbi->font), crenderer->cr)) + if (!hbi || !_pango_cairo_font_install ((PangoFont *)(hbi->font), crenderer->cr)) { _pango_cairo_renderer_draw_box_glyph (crenderer, gi, cx, cy); goto done; @@ -204,7 +204,7 @@ pango_cairo_renderer_draw_glyphs (PangoRenderer *renderer, if (!crenderer->do_path) set_color (crenderer, PANGO_RENDER_PART_FOREGROUND); - if (!_pango_cairo_font_install ((PangoCairoFont *) (font), crenderer->cr)) + if (!_pango_cairo_font_install (font, crenderer->cr)) { for (i = 0; i < glyphs->num_glyphs; i++) { @@ -455,8 +455,6 @@ acquire_renderer (gboolean *free_renderer) { PangoCairoRenderer *renderer; - /* renderer = _pango_cairo_font_map_get_renderer (PANGO_CAIRO_FONT_MAP (fontmap)); */ - if (G_LIKELY (G_TRYLOCK (cached_renderer))) { if (G_UNLIKELY (!cached_renderer)) |