walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hb-coretext.cc: remove TARGET_OS_MAC from test (#1578) 

it is always true when building on APPLE systems
and this file only builds on APPLE systems
This commit is contained in:
Ken 2019-02-10 23:46:05 -08:00 committed by Ebrahim Byagowi
parent f55e7bf583
commit fdfa3d29b7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hb-coretext.cc
View File

@ -171,7 +171,7 @@ create_ct_font (CGFontRef cg_font, CGFloat font_size)
if (CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSText")) || if (CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSText")) ||
CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSDisplay"))) CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSDisplay")))
{ {
#if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1080 #if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1080
# define kCTFontUIFontSystem kCTFontSystemFontType # define kCTFontUIFontSystem kCTFontSystemFontType
# define kCTFontUIFontEmphasizedSystem kCTFontEmphasizedSystemFontType # define kCTFontUIFontEmphasizedSystem kCTFontEmphasizedSystemFontType
#endif #endif
@ -214,7 +214,7 @@ create_ct_font (CGFontRef cg_font, CGFloat font_size)
} }
CFURLRef original_url = nullptr; CFURLRef original_url = nullptr;
#if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060 #if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
ATSFontRef atsFont; ATSFontRef atsFont;
FSRef fsref; FSRef fsref;
OSStatus status; OSStatus status;
@ -244,7 +244,7 @@ create_ct_font (CGFontRef cg_font, CGFloat font_size)
* process in Blink. This can be detected by the new file URL location * process in Blink. This can be detected by the new file URL location
* that the newly found font points to. */ * that the newly found font points to. */
CFURLRef new_url = nullptr; CFURLRef new_url = nullptr;
#if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060 #if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
atsFont = CTFontGetPlatformFont (new_ct_font, NULL); atsFont = CTFontGetPlatformFont (new_ct_font, NULL);
status = ATSFontGetFileReference (atsFont, &fsref); status = ATSFontGetFileReference (atsFont, &fsref);
if (status == noErr) if (status == noErr)
@ -711,7 +711,7 @@ resize_and_retry:
/* What's the iOS equivalent of this check? /* What's the iOS equivalent of this check?
* The symbols was introduced in iOS 7.0. * The symbols was introduced in iOS 7.0.
* At any rate, our fallback is safe and works fine. */ * At any rate, our fallback is safe and works fine. */
#if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1090 #if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1090
# define kCTLanguageAttributeName CFSTR ("NSLanguage") # define kCTLanguageAttributeName CFSTR ("NSLanguage")
#endif #endif
CFStringRef lang = CFStringCreateWithCStringNoCopy (kCFAllocatorDefault, CFStringRef lang = CFStringCreateWithCStringNoCopy (kCFAllocatorDefault,
@ -783,7 +783,7 @@ resize_and_retry:
int level = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1; int level = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1;
CFNumberRef level_number = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &level); CFNumberRef level_number = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &level);
#if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060 #if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel; extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel;
#endif #endif
CFDictionaryRef options = CFDictionaryCreate (kCFAllocatorDefault, CFDictionaryRef options = CFDictionaryCreate (kCFAllocatorDefault,