diff options
| author | Richard Hult <richard@imendio.com> | 2007-06-24 19:55:47 +0000 |
|---|---|---|
| committer | Richard Hult <rhult@src.gnome.org> | 2007-06-24 19:55:47 +0000 |
| commit | e1c8f581032024799bf424d26d4a70852017cd56 (patch) | |
| tree | 49e1509a173b73721d8668b5d7900dabd8117713 /pango/pangocairo-atsuifont.c | |
| parent | cd52bcd5dbb61f5cbada046ff917457e9f34b204 (diff) | |
| download | pango-e1c8f581032024799bf424d26d4a70852017cd56.tar.gz | |
Bug 449543 - Ship pangoatsui.h
2007-06-24 Richard Hult <richard@imendio.com>
Bug 449543 - Ship pangoatsui.h
* pango/pangoatsui-fontmap.c:
* pango/pangoatsui-private.h:
* pango/pangoatsui.c:
* pango/pangoatsui.h:
* pango/pangocairo-atsuifont.c:
* pango/pangocairo-atsuifont.h: Move get_atsu_font_id from the
cairo atsui font class to the atsui base class. Make the members
of the atsui font private and adapt all users of them.
* pango/Makefile.am: Ship pangoatsui.h.
* modules/basic/basic-atsui.c: (basic_engine_shape): Adapt to the
above changes.
svn path=/trunk/; revision=2366
Diffstat (limited to 'pango/pangocairo-atsuifont.c')
| -rw-r--r-- | pango/pangocairo-atsuifont.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pango/pangocairo-atsuifont.c b/pango/pangocairo-atsuifont.c index e477a036..7c1042b3 100644 --- a/pango/pangocairo-atsuifont.c +++ b/pango/pangocairo-atsuifont.c @@ -179,10 +179,9 @@ static PangoFontDescription * pango_cairo_atsui_font_describe_absolute (PangoFont *font) { PangoFontDescription *desc; - PangoATSUIFont *afont = (PangoATSUIFont *) font; PangoCairoATSUIFont *cafont = (PangoCairoATSUIFont *) font; - desc = pango_font_description_copy (afont->desc); + desc = pango_font_describe (font); pango_font_description_set_absolute_size (desc, cafont->absolute_size); return desc; @@ -275,8 +274,8 @@ _pango_cairo_atsui_font_new (PangoCairoATSUIFontMap *cafontmap, cafont = g_object_new (PANGO_TYPE_CAIRO_ATSUI_FONT, NULL); afont = PANGO_ATSUI_FONT (cafont); - afont->desc = pango_font_description_copy (desc); - afont->face = face; + _pango_atsui_font_set_font_description (afont, desc); + _pango_atsui_font_set_face (afont, face); size = (double) pango_font_description_get_size (desc) / PANGO_SCALE; cafont->font_id = font_id; |