Fix loading font from data

Michael Belyaev · Michael Belyaev · commit c7b87610b5db · 2020-05-11T00:25:41.000+03:00
diff --git a/src/font_renderer/ct_font_renderer.cpp b/src/font_renderer/ct_font_renderer.cpp
@@ -26,9 +26,11 @@ class CtFontRenderer : public FontRenderer {
 
 CtFontRenderer::CtFontRenderer(const FontRendererArgs& args)
 {
-    CFStringRef fontName = CFStringCreateWithCString(NULL, (const char*)args.data, kCFStringEncodingUTF8);
-    font = CTFontCreateWithName(fontName, args.pxSize, NULL);
-    CFRelease(fontName);
+    CTFontDescriptorRef descriptor = CTFontManagerCreateFontDescriptorFromData(CFDataCreate(nullptr, static_cast<const UInt8*>(args.data), args.dataSize));
+    if (!descriptor)
+        throw FontRendererError("CoreText can't create descriptor");
+    font = CTFontCreateWithFontDescriptor(descriptor, static_cast<CGFloat>(args.pxSize), nullptr);
+    CFRelease(descriptor);
     if (!font)
         throw FontRendererError("CoreText can't init font");
 }

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,11 @@ class CtFontRenderer : public FontRenderer {`
`26`	`26`
`27`	`27`	`CtFontRenderer::CtFontRenderer(const FontRendererArgs& args)`
`28`	`28`	`{`
`29`		`- CFStringRef fontName = CFStringCreateWithCString(NULL, (const char*)args.data, kCFStringEncodingUTF8);`
`30`		`- font = CTFontCreateWithName(fontName, args.pxSize, NULL);`
`31`		`- CFRelease(fontName);`
	`29`	`+ CTFontDescriptorRef descriptor = CTFontManagerCreateFontDescriptorFromData(CFDataCreate(nullptr, static_cast<const UInt8*>(args.data), args.dataSize));`
	`30`	`+ if (!descriptor)`
	`31`	`+ throw FontRendererError("CoreText can't create descriptor");`
	`32`	`+ font = CTFontCreateWithFontDescriptor(descriptor, static_cast<CGFloat>(args.pxSize), nullptr);`
	`33`	`+ CFRelease(descriptor);`
`32`	`34`	`if (!font)`
`33`	`35`	`throw FontRendererError("CoreText can't init font");`
`34`	`36`	`}`