summaryrefslogtreecommitdiff
path: root/gtk/gtkquartz.c
diff options
context:
space:
mode:
authorJohn Ralls <jralls@ceridwen.us>2011-11-07 13:48:03 -0800
committerJohn Ralls <jralls@ceridwen.us>2011-11-07 13:57:10 -0800
commit42656dde57ac1b661ff0692ed210617ec49d34c0 (patch)
treec260a73351d9976b1cafe77c86b54f2d6a8207b0 /gtk/gtkquartz.c
parent3243e6955cd4014345170fdd9246a13eacad86dd (diff)
downloadgtk+-42656dde57ac1b661ff0692ed210617ec49d34c0.tar.gz
Revert "[Quartz Bug 663182] NSImage throws an exception from _gtk_quartz_create_image_from_pixbuf()". Utterly screwed up. Sorry.
This reverts commit 8216324e4b13f0349ed3c0f854d41e6b32d1f0cb. and commit 3243e6955cd4014345170fdd9246a13eacad86dd.
Diffstat (limited to 'gtk/gtkquartz.c')
-rw-r--r--gtk/gtkquartz.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c
index 3b9558d387..74570005cd 100644
--- a/gtk/gtkquartz.c
+++ b/gtk/gtkquartz.c
@@ -35,11 +35,9 @@ _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);
@@ -59,12 +57,6 @@ _gtk_quartz_create_image_from_pixbuf (GdkPixbuf *pixbuf)
CGColorSpaceRelease (colorspace);
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];
context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];