From a03a59b188eacc9da2cf31b8645d8c181567cdb5 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Thu, 8 Nov 2012 22:14:18 +0000 Subject: bitmap: ret CoglError from _new_with_malloc_buffer _cogl_bitmap_new_with_malloc_buffer() now takes a CoglError for throwing exceptional errors and all callers have been updated to pass through any application error pointer as appropriate. Reviewed-by: Neil Roberts (cherry picked from commit 67cad9c0eb5e2650b75aff16abde49f23aabd0cc) --- cogl/cogl-bitmap-conversion.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'cogl/cogl-bitmap-conversion.c') diff --git a/cogl/cogl-bitmap-conversion.c b/cogl/cogl-bitmap-conversion.c index 15500ab3..14f55115 100644 --- a/cogl/cogl-bitmap-conversion.c +++ b/cogl/cogl-bitmap-conversion.c @@ -488,7 +488,10 @@ _cogl_bitmap_convert (CoglBitmap *src_bmp, dst_bmp = _cogl_bitmap_new_with_malloc_buffer (ctx, width, height, - dst_format); + dst_format, + error); + if (!dst_bmp) + return NULL; if (!_cogl_bitmap_convert_into_bitmap (src_bmp, dst_bmp, error)) { -- cgit v1.2.1