mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 04:52:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20817 from komakai:fix_old_xcode_build

Browse Source
This commit is contained in:
Alexander Alekhin 2021-10-06 17:32:09 +00:00
commit 2eb1ee967c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/imgcodecs/misc/objc/ios/Mat+QuickLook.mm
View File

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

4
modules/imgcodecs/misc/objc/macosx/Mat+QuickLook.mm
View File

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