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 /modules | |
| 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 'modules')
| -rw-r--r-- | modules/basic/basic-atsui.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/modules/basic/basic-atsui.c b/modules/basic/basic-atsui.c index 221da12c..fc343be6 100644 --- a/modules/basic/basic-atsui.c +++ b/modules/basic/basic-atsui.c @@ -27,7 +27,6 @@ #include "pango-utils.h" #include "pango-fontmap.h" #include "pangoatsui.h" -#include "pangocairo-atsuifont.h" /* No extra fields needed */ typedef PangoEngineShape BasicEngineATSUI; @@ -112,14 +111,12 @@ basic_engine_shape (PangoEngineShape *engine, ItemCount glyph_count; int i; const char *p; - PangoCairoATSUIFont *cafont = PANGO_CAIRO_ATSUI_FONT (font); + PangoATSUIFont *afont = PANGO_ATSUI_FONT (font); ATSUStyle style; ATSUFontID fontID; - ATSUAttributeTag styleTags[] = - { kATSUFontTag }; + ATSUAttributeTag styleTags[] = { kATSUFontTag }; ATSUAttributeValuePtr styleValues[] = { &fontID }; - ByteCount styleSizes[] = - { sizeof(ATSUFontID) }; + ByteCount styleSizes[] = { sizeof (ATSUFontID) }; utf16 = g_utf8_to_utf16 (text, length, NULL, &n16, NULL); @@ -127,7 +124,7 @@ basic_engine_shape (PangoEngineShape *engine, err = ATSUSetTextPointerLocation (text_layout, utf16, 0, n16, n16); err = ATSUCreateStyle(&style); - fontID = pango_cairo_atsui_font_get_atsu_font_id (cafont); + fontID = pango_atsui_font_get_atsu_font_id (afont); err = ATSUSetAttributes(style, sizeof(styleTags) / sizeof(styleTags[0]), @@ -141,7 +138,6 @@ basic_engine_shape (PangoEngineShape *engine, (void *)&layout_records, &glyph_count); - p = text; pango_glyph_string_set_size (glyphs, glyph_count - 1); |