diff options
| author | Robert Bragg <robert@linux.intel.com> | 2012-11-08 22:14:18 +0000 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2013-01-21 14:20:32 +0000 |
| commit | a03a59b188eacc9da2cf31b8645d8c181567cdb5 (patch) | |
| tree | 016c359ad5f412ea865e6fb27b00e7209039b334 /cogl/cogl-bitmap-conversion.c | |
| parent | 2adfe6d80577e12f817c85026fb699b2859b82ec (diff) | |
| download | cogl-a03a59b188eacc9da2cf31b8645d8c181567cdb5.tar.gz | |
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 <neil@linux.intel.com>
(cherry picked from commit 67cad9c0eb5e2650b75aff16abde49f23aabd0cc)
Diffstat (limited to 'cogl/cogl-bitmap-conversion.c')
| -rw-r--r-- | cogl/cogl-bitmap-conversion.c | 5 |
1 files changed, 4 insertions, 1 deletions
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)) { |