[PATCH] win32u: Remove workaround for Mac OS X 10.4 and 10.5.
Brendan Shanks
bshanks at codeweavers.com
Thu Mar 17 22:07:20 CDT 2022
Signed-off-by: Brendan Shanks <bshanks at codeweavers.com>
---
dlls/win32u/freetype.c | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c
index 77f4ef8eab3..b6063a14570 100644
--- a/dlls/win32u/freetype.c
+++ b/dlls/win32u/freetype.c
@@ -1773,35 +1773,7 @@ static void load_mac_fonts(void)
CFStringRef path;
desc = CFArrayGetValueAtIndex(descs, i);
-
-#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
url = CTFontDescriptorCopyAttribute(desc, kCTFontURLAttribute);
-#else
- /* CTFontDescriptor doesn't support kCTFontURLAttribute prior to 10.6, so
- we have to go CFFontDescriptor -> CTFont -> ATSFont -> FSRef -> CFURL. */
- {
- CTFontRef font;
- ATSFontRef atsFont;
- OSStatus status;
- FSRef fsref;
-
- font = CTFontCreateWithFontDescriptor(desc, 0, NULL);
- if (!font) continue;
-
- atsFont = CTFontGetPlatformFont(font, NULL);
- if (!atsFont)
- {
- CFRelease(font);
- continue;
- }
-
- status = ATSFontGetFileReference(atsFont, &fsref);
- CFRelease(font);
- if (status != noErr) continue;
-
- url = CFURLCreateFromFSRef(NULL, &fsref);
- }
-#endif
if (!url) continue;
ext = CFURLCopyPathExtension(url);
--
2.32.0 (Apple Git-132)
More information about the wine-devel
mailing list