summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorculler <culler>2021-04-26 18:25:34 (GMT)
committerculler <culler>2021-04-26 18:25:34 (GMT)
commitd1e9f44fa89edd1678fc44ea381b512331c93dad (patch)
tree02c504d2b8783eccb7070dc320a01283ceb9c6c8
parentdec7fcd84bf9a65894e15a41aef167c8ef493dca (diff)
parentb7b4ae4363b5a53e03e31c838f4f43602e2e1787 (diff)
downloadtk-d1e9f44fa89edd1678fc44ea381b512331c93dad.zip
tk-d1e9f44fa89edd1678fc44ea381b512331c93dad.tar.gz
tk-d1e9f44fa89edd1678fc44ea381b512331c93dad.tar.bz2
Merge 8.6
-rw-r--r--macosx/tkMacOSXFont.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index 00a0b9e..ab13fd0 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -1209,11 +1209,13 @@ TkpDrawAngledCharsInContext(
TkSetMacColor(gc->foreground, &fg);
attributes = [fontPtr->nsAttributes mutableCopy];
[attributes setObject:(id)fg forKey:(id)kCTForegroundColorAttributeName];
+ CFRelease(fg);
nsFont = [attributes objectForKey:NSFontAttributeName];
[nsFont setInContext:GET_NSCONTEXT(context, NO)];
CGContextSetTextMatrix(context, CGAffineTransformIdentity);
attributedString = [[NSAttributedString alloc] initWithString:string
attributes:attributes];
+ [string release];
typesetter = CTTypesetterCreateWithAttributedString(
(CFAttributedStringRef)attributedString);
textX += (CGFloat) macWin->xOff;
@@ -1250,7 +1252,6 @@ TkpDrawAngledCharsInContext(
CFRelease(line);
CFRelease(typesetter);
[attributedString release];
- [string release];
[attributes release];
TkMacOSXRestoreDrawingContext(&drawingContext);
}