sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

quartz-image: Pass a CoglError argument to the bitmap functions

Browse source 
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 <robert@linux.intel.com>

(cherry picked from commit 1827965befccf331b0787f71cb191d370640a9de)
This commit is contained in:
Neil Roberts 2013-03-28 13:57:11 +00:00
parent dabfbcce53
commit a1952a25ad
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cogl/cogl-bitmap-pixbuf.c
View file

@ -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);