From a1952a25ad44d0228169b66c0cafbfba48f0b8c6 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Thu, 28 Mar 2013 13:57:11 +0000 Subject: [PATCH] quartz-image: Pass a CoglError argument to the bitmap functions Since 67cad9c0 and f7735e141a the bitmap allocation and mapping functions now take an extra error argument. The quartz image backend was missed in this update so Cogl would fail to compile if --enable-quartz-image is used. https://bugzilla.gnome.org/show_bug.cgi?id=696730 Reviewed-by: Robert Bragg (cherry picked from commit 1827965befccf331b0787f71cb191d370640a9de) --- cogl/cogl-bitmap-pixbuf.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/cogl/cogl-bitmap-pixbuf.c b/cogl/cogl-bitmap-pixbuf.c index a02b253c8..ad34234ac 100644 --- a/cogl/cogl-bitmap-pixbuf.c +++ b/cogl/cogl-bitmap-pixbuf.c @@ -125,11 +125,24 @@ _cogl_bitmap_from_file (CoglContext *ctx, /* allocate buffer big enough to hold pixel data */ bmp = _cogl_bitmap_new_with_malloc_buffer (ctx, width, height, - COGL_PIXEL_FORMAT_ARGB_8888); + COGL_PIXEL_FORMAT_ARGB_8888, + error); + if (bmp == NULL) + { + CFRelease (image); + return NULL; + } rowstride = cogl_bitmap_get_rowstride (bmp); out_data = _cogl_bitmap_map (bmp, COGL_BUFFER_ACCESS_WRITE, - COGL_BUFFER_MAP_HINT_DISCARD); + COGL_BUFFER_MAP_HINT_DISCARD, + error); + if (out_data == NULL) + { + cogl_object_unref (bmp); + CFRelease (image); + return NULL; + } /* render to buffer */ color_space = CGColorSpaceCreateWithName (kCGColorSpaceGenericRGB);