procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid deprecated enums in mac-ct font backend driver

Browse source 
* src/macfont.m (mac_font_copy_default_descriptors_for_language)
(mac_ctfont_get_advance_width_for_glyph)
(mac_ctfont_get_bounding_rect_for_glyph): Avoid deprecated enums.
This commit is contained in:
YAMAMOTO Mitsuharu 2015-07-13 19:14:25 +09:00
parent 455fe1a7f1
commit a1f783824f
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/macfont.m
View file

@ -3521,15 +3521,25 @@ So we use CTFontDescriptorCreateMatchingFontDescriptor (no
static inline double
mac_ctfont_get_advance_width_for_glyph (CTFontRef font, CGGlyph glyph)
{
return CTFontGetAdvancesForGlyphs (font, kCTFontDefaultOrientation,
&glyph, NULL, 1);
return CTFontGetAdvancesForGlyphs (font,
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
kCTFontOrientationDefault,
#else
kCTFontDefaultOrientation,
#endif
&glyph, NULL, 1);
}
static inline CGRect
mac_ctfont_get_bounding_rect_for_glyph (CTFontRef font, CGGlyph glyph)
{
return CTFontGetBoundingRectsForGlyphs (font, kCTFontDefaultOrientation,
&glyph, NULL, 1);
return CTFontGetBoundingRectsForGlyphs (font,
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
kCTFontOrientationDefault,
#else
kCTFontDefaultOrientation,
#endif
&glyph, NULL, 1);
}
static CFArrayRef
@ -3891,7 +3901,7 @@ So we use CTFontDescriptorCreateMatchingFontDescriptor (no
#endif
{
CTFontRef user_font =
CTFontCreateUIFontForLanguage (kCTFontUserFontType, 0, language);
CTFontCreateUIFontForLanguage (kCTFontUIFontUser, 0, language);
if (user_font)
{