diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2010-09-21 15:47:17 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2010-09-21 15:49:07 -0400 |
| commit | 64ada662476f5b5506a9a455f4c39242ab51ff38 (patch) | |
| tree | e823ef001fb95198ba0fea2944db8334daef4942 /modules/basic/basic-atsui.c | |
| parent | e008ca8f198965b55fc4ef297b4d31902b5afc36 (diff) | |
| parent | 254f42980e272f0560b28d466c2b65a1748b1132 (diff) | |
| download | pango-64ada662476f5b5506a9a455f4c39242ab51ff38.tar.gz | |
Merge branch 'master' into harfbuzz-ng-external
Conflicts:
pango/Makefile.am
pango/pango-ot-buffer.c
pango/pango-ot-info.c
Removed:
pango/opentype/Makefile.am
pango/opentype/hb-blob.c
pango/opentype/hb-open-file-private.hh
pango/opentype/hb-open-type-private.hh
pango/opentype/hb-ot-layout-common-private.hh
pango/opentype/hb-ot-layout-gdef-private.hh
pango/opentype/hb-ot-layout-gpos-private.hh
pango/opentype/hb-ot-layout-gsub-private.hh
pango/opentype/hb-ot-layout-gsubgpos-private.hh
pango/opentype/hb-ot-layout.cc
pango/opentype/hb-ot-layout.h
pango/opentype/hb-private.h
Diffstat (limited to 'modules/basic/basic-atsui.c')
| -rw-r--r-- | modules/basic/basic-atsui.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/modules/basic/basic-atsui.c b/modules/basic/basic-atsui.c index a3df773d..369a596a 100644 --- a/modules/basic/basic-atsui.c +++ b/modules/basic/basic-atsui.c @@ -86,21 +86,24 @@ basic_engine_shape (PangoEngineShape *engine, const char *p; PangoATSUIFont *afont = PANGO_ATSUI_FONT (font); ATSUStyle style; - CGFontRef fontID; + ATSUFontID fontID; ATSUAttributeTag styleTags[] = { kATSUFontTag }; ATSUAttributeValuePtr styleValues[] = { &fontID }; - ByteCount styleSizes[] = { sizeof (CGFontRef) }; + ByteCount styleSizes[] = { sizeof (ATSUFontID) }; utf16 = g_utf8_to_utf16 (text, length, NULL, &n16, NULL); - err = ATSUCreateTextLayout (&text_layout); - err = ATSUSetTextPointerLocation (text_layout, utf16, 0, n16, n16); + err = ATSUCreateTextLayoutWithTextPtr (utf16, 0, n16, n16, + 0, + NULL, + NULL, + &text_layout); err = ATSUCreateStyle(&style); - fontID = pango_atsui_font_get_cgfont (afont); + fontID = pango_atsui_font_get_atsfont (afont); err = ATSUSetAttributes(style, - sizeof(styleTags) / sizeof(styleTags[0]), + (ItemCount)(sizeof(styleTags) / sizeof(styleTags[0])), styleTags, styleSizes, styleValues); err = ATSUSetRunStyle(text_layout, |