Merge pull request #20817 from komakai:fix_old_xcode_build

pull/20830/head
Alexander Alekhin 4 years ago
commit 2eb1ee967c
  1. 4
      modules/imgcodecs/misc/objc/ios/Mat+QuickLook.mm
  2. 4
      modules/imgcodecs/misc/objc/macosx/Mat+QuickLook.mm

@ -22,11 +22,15 @@ static UIFont* getBodoni72() {
}
static UIFont* getAnySerif() {
#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
if (@available(iOS 13.0, *)) {
return [UIFont fontWithDescriptor:[[UIFontDescriptor preferredFontDescriptorWithTextStyle:UIFontTextStyleBody] fontDescriptorWithDesign:UIFontDescriptorSystemDesignSerif] size:SIZE];
} else {
return nil;
}
#else
return nil;
#endif
}
static UIFont* getSystemFont() {

@ -22,11 +22,15 @@ static NSFont* getBodoni72() {
}
static NSFont* getAnySerif() {
#if defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
if (@available(macOS 11.0, *)) {
return [NSFont fontWithDescriptor:[[NSFontDescriptor preferredFontDescriptorForTextStyle:NSFontTextStyleBody options:@{}] fontDescriptorWithDesign:NSFontDescriptorSystemDesignSerif] size:SIZE];
} else {
return nil;
}
#else
return nil;
#endif
}
static NSFont* getSystemFont() {

Loading…
Cancel
Save