diff options
| -rw-r--r-- | macosx/tkMacOSXImage.c | 41 | ||||
| -rw-r--r-- | macosx/tkMacOSXWm.c | 11 | ||||
| -rw-r--r-- | macosx/ttkMacOSXTheme.c | 1 |
3 files changed, 34 insertions, 19 deletions
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c index 28c73df..0b63148 100644 --- a/macosx/tkMacOSXImage.c +++ b/macosx/tkMacOSXImage.c @@ -144,25 +144,28 @@ TkMacOSXCreateCGImageWithXImage( bitsPerComponent = 1; bitsPerPixel = 1; - if (image->bitmap_bit_order != MSBFirst) { - char *srcPtr = image->data + image->xoffset; - char *endPtr = srcPtr + len; - char *destPtr = (data = (char *)ckalloc(len)); + data = (char *)ckalloc(len); + if (data) { + if (image->bitmap_bit_order != MSBFirst) { + char *srcPtr = image->data + image->xoffset; + char *endPtr = srcPtr + len; + char *destPtr = data; - while (srcPtr < endPtr) { - *destPtr++ = xBitReverseTable[(unsigned char)(*(srcPtr++))]; + while (srcPtr < endPtr) { + *destPtr++ = xBitReverseTable[(unsigned char)(*(srcPtr++))]; + } + } else { + memcpy(data, image->data + image->xoffset, len); } - } else { - data = (char *)memcpy(ckalloc(len), image->data + image->xoffset, len); - } - if (data) { provider = CGDataProviderCreateWithData(data, data, len, releaseData); - } - if (provider) { + if (!provider) { + ckfree(data); + } img = CGImageMaskCreate(image->width, image->height, bitsPerComponent, bitsPerPixel, image->bytes_per_line, provider, decode, 0); + CGDataProviderRelease(provider); } } else if ((image->format == ZPixmap) && (image->bits_per_pixel == 32)) { @@ -170,8 +173,6 @@ TkMacOSXCreateCGImageWithXImage( * Color image */ - CGColorSpaceRef colorspace = CGColorSpaceCreateDeviceRGB(); - if (image->width == 0 && image->height == 0) { /* @@ -180,19 +181,22 @@ TkMacOSXCreateCGImageWithXImage( return NULL; } + CGColorSpaceRef colorspace = CGColorSpaceCreateDeviceRGB(); bitsPerComponent = 8; bitsPerPixel = 32; bitmapInfo = kCGBitmapByteOrder32Big | alphaInfo; - data = (char *)memcpy(ckalloc(len), image->data + image->xoffset, len); + data = (char *)ckalloc(len); if (data) { + memcpy(data, image->data + image->xoffset, len); provider = CGDataProviderCreateWithData(data, data, len, releaseData); - } - if (provider) { + if (!provider) { + ckfree(data); + } img = CGImageCreate(image->width, image->height, bitsPerComponent, bitsPerPixel, image->bytes_per_line, colorspace, bitmapInfo, provider, decode, 0, kCGRenderingIntentDefault); - CFRelease(provider); + CGDataProviderRelease(provider); } if (colorspace) { CFRelease(colorspace); @@ -635,6 +639,7 @@ CreateCGImageFromDrawableRect( CGImageRef cg_image = NULL, result = NULL; if (mac_drawable->flags & TK_IS_PIXMAP) { cg_context = TkMacOSXGetCGContextForDrawable(drawable); + CGContextRetain(cg_context); } else { NSView *view = TkMacOSXGetNSViewForDrawable(mac_drawable); if (view == nil) { diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index 97f814d..39fc04f 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -1125,6 +1125,13 @@ TkWmDeadWindow( * preventing zombies is to set the key window to nil. */ + + /* + * Fix bug 5692042764: + * set tkEventTarget to NULL when there is no window to send Tk events to. + */ + TkWindow *newTkEventTarget = NULL; + for (NSWindow *w in [NSApp orderedWindows]) { TkWindow *winPtr2 = TkMacOSXGetTkWindow(w); BOOL isOnScreen; @@ -1137,11 +1144,13 @@ TkWmDeadWindow( wmPtr2->hints.initial_state != WithdrawnState); if (w != deadNSWindow && isOnScreen && [w canBecomeKeyWindow]) { [w makeKeyAndOrderFront:NSApp]; - [NSApp setTkEventTarget:TkMacOSXGetTkWindow(w)]; + newTkEventTarget = TkMacOSXGetTkWindow(w); break; } } + [NSApp setTkEventTarget:newTkEventTarget]; + /* * Prevent zombies on systems with a TouchBar. */ diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c index 863657b..2a2acd8 100644 --- a/macosx/ttkMacOSXTheme.c +++ b/macosx/ttkMacOSXTheme.c @@ -1188,6 +1188,7 @@ static void DrawDarkFocusRing( CGPathRef path = CGPathCreateWithRoundedRect(insetBounds, 4, 4, NULL); CGContextBeginPath(context); CGContextAddPath(context, path); + CGPathRelease(path); CGContextAddRect(context, bounds); CGContextEOFillPath(context); CGContextRestoreGState(context); |