summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Walzer <kw@codebykevin.com>2015-03-10 14:47:46 (GMT)
committerKevin Walzer <kw@codebykevin.com>2015-03-10 14:47:46 (GMT)
commitb255c39272f2b4a3e695694965ec2c5368dab823 (patch)
tree2cd6273761d6289fbfdd5b189e9abb13d22fc0dc
parent47fd7962d3cfef856eb49d868612ff4ef3423aa4 (diff)
downloadtk-b255c39272f2b4a3e695694965ec2c5368dab823.zip
tk-b255c39272f2b4a3e695694965ec2c5368dab823.tar.gz
tk-b255c39272f2b4a3e695694965ec2c5368dab823.tar.bz2
Fix for crash when image is dealloc'ed prematurely in Cocoa
-rw-r--r--macosx/tkMacOSXDraw.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index f94c8af..c1ffdf8 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -148,7 +148,8 @@ BitmapRepFromDrawableRect(
cg_image = CGBitmapContextCreateImage( (CGContextRef) cg_context);
sub_cg_image = CGImageCreateWithImageInRect(cg_image, image_rect);
if ( sub_cg_image ) {
- bitmap_rep = [[NSBitmapImageRep alloc] autorelease];
+ /*This can be dealloc'ed prematurely if set for autorelease, causing crashes.*/
+ bitmap_rep = [NSBitmapImageRep alloc];
[bitmap_rep initWithCGImage:sub_cg_image];
}
if ( cg_image ) {
@@ -162,7 +163,8 @@ BitmapRepFromDrawableRect(
width,height);
if ( [view lockFocusIfCanDraw] ) {
- bitmap_rep = [[NSBitmapImageRep alloc] autorelease];
+ /*This can be dealloc'ed prematurely if set for autorelease, causing crashes.*/
+ bitmap_rep = [NSBitmapImageRep alloc];
bitmap_rep = [bitmap_rep initWithFocusedViewRect:view_rect];
[view unlockFocus];
} else {