From eb56ca3b0d7dec26603f45b9d9e63fc186e27eaa Mon Sep 17 00:00:00 2001 From: Giles Payne Date: Wed, 6 Oct 2021 21:06:30 +0900 Subject: [PATCH] Fix build on older Xcode versions --- modules/imgcodecs/misc/objc/ios/Mat+QuickLook.mm | 4 ++++ modules/imgcodecs/misc/objc/macosx/Mat+QuickLook.mm | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/imgcodecs/misc/objc/ios/Mat+QuickLook.mm b/modules/imgcodecs/misc/objc/ios/Mat+QuickLook.mm index 7bfee07eb1..84cf25879b 100644 --- a/modules/imgcodecs/misc/objc/ios/Mat+QuickLook.mm +++ b/modules/imgcodecs/misc/objc/ios/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() { diff --git a/modules/imgcodecs/misc/objc/macosx/Mat+QuickLook.mm b/modules/imgcodecs/misc/objc/macosx/Mat+QuickLook.mm index 6775f81780..bdc5eda811 100644 --- a/modules/imgcodecs/misc/objc/macosx/Mat+QuickLook.mm +++ b/modules/imgcodecs/misc/objc/macosx/Mat+QuickLook.mm @@ -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() { -- GitLab