diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-14 10:17:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-14 10:17:14 +0400 |
| commit | 7a71f58af3b5f70e8982d827d1fef7e8bc4e4ec8 (patch) | |
| tree | ae5ee3e8c3a1d029e54531bbfd5ac8db42d9f7d9 /source/blender/imbuf/intern/iris.c | |
| parent | 3957efdd38d0d5136f8d106de3a79e07b7b0b15f (diff) | |
fixes for NULL checks, remove some redundant checks and add some in that have been removed by accident as code has been updated.
Diffstat (limited to 'source/blender/imbuf/intern/iris.c')
| -rw-r--r-- | source/blender/imbuf/intern/iris.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index e76a59905cb..13b0fc1b55a 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -522,15 +522,13 @@ struct ImBuf *imb_loadiris(unsigned char *mem, size_t size, int flags) } - if (ibuf) { - ibuf->ftype = IMAGIC; - ibuf->profile = IB_PROFILE_SRGB; + ibuf->ftype = IMAGIC; + ibuf->profile = IB_PROFILE_SRGB; - test_endian_zbuf(ibuf); + test_endian_zbuf(ibuf); - if (ibuf->rect) { - IMB_convert_rgba_to_abgr(ibuf); - } + if (ibuf->rect) { + IMB_convert_rgba_to_abgr(ibuf); } return(ibuf); |