diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-11 16:13:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-11 16:13:41 +0400 |
| commit | 5248ec57d97050f48efdd00d3106016ad4553363 (patch) | |
| tree | 8ff7a1048854d7636129aa48bfac454649738918 /source/blender/imbuf/intern/divers.c | |
| parent | 71a7fb6286637afa44dad7684f0eae80727a41c1 (diff) | |
minor fixes
- new compositor could use uninitialized var
- profile conversion could use uninitialized var
- set better warnings for clang+cmake.
- remove picky warnings from sphinx doc gen shell script.
Diffstat (limited to 'source/blender/imbuf/intern/divers.c')
| -rw-r--r-- | source/blender/imbuf/intern/divers.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c index 279fd5d59be..1b68c520336 100644 --- a/source/blender/imbuf/intern/divers.c +++ b/source/blender/imbuf/intern/divers.c @@ -538,12 +538,16 @@ void IMB_rect_from_float(ImBuf *ibuf) imb_addrectImBuf(ibuf); /* determine profiles */ - if (ibuf->profile == IB_PROFILE_LINEAR_RGB) + if (ibuf->profile == IB_PROFILE_LINEAR_RGB) { profile_from = IB_PROFILE_LINEAR_RGB; - else if (ELEM(ibuf->profile, IB_PROFILE_SRGB, IB_PROFILE_NONE)) + } + else if (ELEM(ibuf->profile, IB_PROFILE_SRGB, IB_PROFILE_NONE)) { profile_from = IB_PROFILE_SRGB; - else + } + else { + profile_from = IB_PROFILE_SRGB; /* should never happen */ BLI_assert(0); + } /* do conversion */ IMB_buffer_byte_from_float((uchar *)ibuf->rect, ibuf->rect_float, @@ -571,12 +575,16 @@ void IMB_partial_rect_from_float(ImBuf *ibuf, float *buffer, int x, int y, int w imb_addrectImBuf(ibuf); /* determine profiles */ - if (ibuf->profile == IB_PROFILE_LINEAR_RGB) + if (ibuf->profile == IB_PROFILE_LINEAR_RGB) { profile_from = IB_PROFILE_LINEAR_RGB; - else if (ELEM(ibuf->profile, IB_PROFILE_SRGB, IB_PROFILE_NONE)) + } + else if (ELEM(ibuf->profile, IB_PROFILE_SRGB, IB_PROFILE_NONE)) { profile_from = IB_PROFILE_SRGB; - else + } + else { + profile_from = IB_PROFILE_SRGB; /* should never happen */ BLI_assert(0); + } /* do conversion */ rect_float = ibuf->rect_float + (x + y * ibuf->x) * ibuf->channels; |