Clean up font use in CurvedTextLayer

bryceco · May 18, 2018 · 20276cd · 20276cd
1 parent 30c18cf
commit 20276cd
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/OpenStreetMap/Shared/CurvedTextLayer.m b/OpenStreetMap/Shared/CurvedTextLayer.m
@@ -374,18 +374,12 @@ -(id)getCachedLayerForString:(NSString *)string whiteOnBlack:(BOOL)whiteOnBlack
 
 -(NSArray *)layersWithString:(NSString *)string alongPath:(CGPathRef)path offset:(CGFloat)offset whiteOnBlock:(BOOL)whiteOnBlack
 {
-	static UIFont * uiFont = nil;
-	static CTFontRef ctFont = NULL;
-	static dispatch_once_t onceToken;
-	dispatch_once(&onceToken, ^{
-		uiFont = [UIFont preferredFontForTextStyle:UIFontTextStyleSubheadline];
-		ctFont = (__bridge CTFontRef)uiFont;
-	});
+	UIFont	* uiFont = [UIFont preferredFontForTextStyle:UIFontTextStyleSubheadline];
 
 	UIColor * textColor = whiteOnBlack ? UIColor.whiteColor : UIColor.blackColor;
 	NSAttributedString * attrString = [[NSAttributedString alloc] initWithString:string
 																		 attributes:@{
-																					  (NSString *)kCTFontAttributeName : (__bridge id)ctFont,
+																					  (NSString *)kCTFontAttributeName : uiFont,
 																					  (NSString *)kCTForegroundColorAttributeName : (id)textColor.CGColor }];
 	CTFramesetterRef framesetter = [self framesetterForString:attrString];
 	NSInteger charCount = string.length;