From 1b5dd62b71d8d9b657b0cd7c138c9dc523a07cc4 Mon Sep 17 00:00:00 2001 From: Neil Date: Wed, 17 Mar 2021 14:58:11 +1100 Subject: Change Font to an interface and stop using FontID. Fonts are shared and reference counted using std::shared_ptr. This optimizes memory and reduces potential for allocation bugs. --- cocoa/QuartzTextLayout.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cocoa/QuartzTextLayout.h') diff --git a/cocoa/QuartzTextLayout.h b/cocoa/QuartzTextLayout.h index 0c6eb08dd..0c234fe39 100644 --- a/cocoa/QuartzTextLayout.h +++ b/cocoa/QuartzTextLayout.h @@ -33,7 +33,7 @@ public: } } - CFStringEncoding setText(std::string_view sv, CFStringEncoding encoding, const QuartzTextStyle &r) { + CFStringEncoding setText(std::string_view sv, CFStringEncoding encoding, const QuartzTextStyle *r) { // First clear current values in case of failure. if (mString) { CFRelease(mString); @@ -58,7 +58,7 @@ public: stringLength = CFStringGetLength(str); - CFMutableDictionaryRef stringAttribs = r.getCTStyle(); + CFMutableDictionaryRef stringAttribs = r->getCTStyle(); mString = ::CFAttributedStringCreate(NULL, str, stringAttribs); -- cgit v1.2.3