callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Quartz Bug 663182] NSImage throws an exception from _gtk_quartz_create_image_from_pixbuf()"

Browse Source 
If a zero-sized NSImage calls lockfocus it throws an exception. Make sure that the image isn't zero-sized before calling lockfocus, and log a warning and return NULL if it is zero-sized.

Have the quartz version of gtk_drag_begin_idle return FALSE if the returned image is NULL.
This commit is contained in:
John Ralls
2011-11-07 14:25:08 -08:00
parent 42656dde57
commit 085b98f470
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkdnd-quartz.c
View File

@ -1081,6 +1081,11 @@ gtk_drag_begin_idle (gpointer arg)
point = [info->nsevent locationInWindow];
drag_image = _gtk_quartz_create_image_from_pixbuf (info->icon_pixbuf);
if (drag_image == NULL)
{
g_object_unref (info->context);
return FALSE;
}
point.x -= info->hot_x;
point.y -= info->hot_y;

9
gtk/gtkquartz.c
View File

@ -35,9 +35,11 @@ _gtk_quartz_create_image_from_pixbuf (GdkPixbuf *pixbuf)
int rowstride, pixbuf_width, pixbuf_height;
gboolean has_alpha;
NSImage *nsimage;
NSSize nsimage_size;
pixbuf_width = gdk_pixbuf_get_width (pixbuf);
pixbuf_height = gdk_pixbuf_get_height (pixbuf);
g_return_val_if_fail (pixbuf_width == 0 || pixbuf_height == 0, NULL);
rowstride = gdk_pixbuf_get_rowstride (pixbuf);
has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
@ -57,6 +59,13 @@ _gtk_quartz_create_image_from_pixbuf (GdkPixbuf *pixbuf)
CGColorSpaceRelease (colorspace);
nsimage = [[NSImage alloc] initWithSize:NSMakeSize (pixbuf_width, pixbuf_height)];
nsimage_size = [nsimage size];
if (nsimage_size.width == 0.0 && nsimage_size.height == 0.0)
{
[nsimage release];
g_critical ("%s returned a zero-sized image", G_STRFUNC);
return NULL;
}
[nsimage lockFocus];
context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];