AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
If _gtk_quartz_create_image_from_pixbuf is given a pixbuf with size 0, 0
or which produces an NSImage with size 0.0, 0.0, it throws an exception
which Gtk doesn't handle.

your changes. Lines starting
This commit is contained in:
John Ralls 2011-11-07 13:04:59 -08:00
parent ac943bf69a
commit 8216324e4b
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkdnd-quartz.c
View File

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

8
gtk/gtkquartz.c
View File

@ -35,9 +35,11 @@ _gtk_quartz_create_image_from_pixbuf (GdkPixbuf *pixbuf)
int rowstride, pixbuf_width, pixbuf_height; int rowstride, pixbuf_width, pixbuf_height;
gboolean has_alpha; gboolean has_alpha;
NSImage *nsimage; NSImage *nsimage;
NSSize nsimage_size;
pixbuf_width = gdk_pixbuf_get_width (pixbuf); pixbuf_width = gdk_pixbuf_get_width (pixbuf);
pixbuf_height = gdk_pixbuf_get_height (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); rowstride = gdk_pixbuf_get_rowstride (pixbuf);
has_alpha = gdk_pixbuf_get_has_alpha (pixbuf); has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
@ -57,6 +59,12 @@ _gtk_quartz_create_image_from_pixbuf (GdkPixbuf *pixbuf)
CGColorSpaceRelease (colorspace); CGColorSpaceRelease (colorspace);
nsimage = [[NSImage alloc] initWithSize:NSMakeSize (pixbuf_width, pixbuf_height)]; nsimage = [[NSImage alloc] initWithSize:NSMakeSize (pixbuf_width, pixbuf_height)];
nsimage_size = [nsimage size];
if (size.width == 0.0 && size.height == 0.0)
{
[nsimage release];
g_return_val_if_fail (FALSE, NULL);
}
[nsimage lockFocus]; [nsimage lockFocus];
context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];