diff --git a/Source/TextKit/ASTextKitCoreTextAdditions.mm b/Source/TextKit/ASTextKitCoreTextAdditions.mm index e98b236c5..df3df696c 100644 --- a/Source/TextKit/ASTextKitCoreTextAdditions.mm +++ b/Source/TextKit/ASTextKitCoreTextAdditions.mm @@ -68,16 +68,9 @@ BOOL ASAttributeWithNameIsUnsupportedCoreTextAttribute(NSString *attributeName) // kCTFontAttributeName -> NSFontAttributeName if ([coreTextKey isEqualToString:(NSString *)kCTFontAttributeName]) { + // Its reference type, CTFontRef, is toll-free bridged with UIFont in iOS and NSFont in OS X CTFontRef coreTextFont = (__bridge CTFontRef)coreTextValue; - NSString *fontName = (__bridge_transfer NSString *)CTFontCopyPostScriptName(coreTextFont); - CGFloat fontSize = CTFontGetSize(coreTextFont); - UIFont *font = [UIFont fontWithName:fontName size:fontSize]; - ASDisplayNodeCAssertNotNil(font, @"unable to load font %@ with size %f", fontName, fontSize); - if (font == nil) { - // Gracefully fail if we were unable to load the font. - font = [UIFont systemFontOfSize:fontSize]; - } - cleanAttributes[NSFontAttributeName] = font; + cleanAttributes[NSFontAttributeName] = (__bridge UIFont *)coreTextFont; } // kCTKernAttributeName -> NSKernAttributeName else if ([coreTextKey isEqualToString:(NSString *)kCTKernAttributeName]) {