summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2009-07-26 23:54:28 -0400
committerBehdad Esfahbod <behdad@behdad.org>2009-07-26 23:54:28 -0400
commit01783de926a09dd8a3b11699bc8b1a6b6dce0556 (patch)
tree78662fb2f7a6c15d2192ff6970c387cc1f3fa29a /modules
parent72800869fb784189bac1066265d95a1226bcf212 (diff)
downloadpango-01783de926a09dd8a3b11699bc8b1a6b6dce0556.tar.gz
[atsui] Port to use CoreText instead of ATS
Patch from http://trac.macports.org/ticket/17049
Diffstat (limited to 'modules')
-rw-r--r--modules/basic/basic-atsui.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/basic/basic-atsui.c b/modules/basic/basic-atsui.c
index 538c7158..a3df773d 100644
--- a/modules/basic/basic-atsui.c
+++ b/modules/basic/basic-atsui.c
@@ -86,10 +86,10 @@ basic_engine_shape (PangoEngineShape *engine,
const char *p;
PangoATSUIFont *afont = PANGO_ATSUI_FONT (font);
ATSUStyle style;
- ATSUFontID fontID;
+ CGFontRef fontID;
ATSUAttributeTag styleTags[] = { kATSUFontTag };
ATSUAttributeValuePtr styleValues[] = { &fontID };
- ByteCount styleSizes[] = { sizeof (ATSUFontID) };
+ ByteCount styleSizes[] = { sizeof (CGFontRef) };
utf16 = g_utf8_to_utf16 (text, length, NULL, &n16, NULL);
@@ -97,7 +97,7 @@ basic_engine_shape (PangoEngineShape *engine,
err = ATSUSetTextPointerLocation (text_layout, utf16, 0, n16, n16);
err = ATSUCreateStyle(&style);
- fontID = pango_atsui_font_get_atsu_font_id (afont);
+ fontID = pango_atsui_font_get_cgfont (afont);
err = ATSUSetAttributes(style,
sizeof(styleTags) / sizeof(styleTags[0]),