diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-19 20:44:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-19 20:44:17 +0400 |
| commit | a2492e0603b15366dc6404662843ddeb00b44170 (patch) | |
| tree | 61b0b7d721c3e5d0d872e75b1c27ae5da2b2eb19 /source/blender/imbuf | |
| parent | 397da5000229a5ada135ca58cfe29bb7612f21d3 (diff) | |
style cleanup: braces/indentation
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 5 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 64e80d4383c..63790cf7d25 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -429,10 +429,9 @@ static ImBuf *avi_fetchibuf(struct anim *anim, int position) } } } - else { -#else - if (1) { + else #endif + { ibuf = IMB_allocImBuf(anim->x, anim->y, 24, IB_rect); tmp = AVI_read_frame(anim->avi, AVI_FORMAT_RGB32, position, diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 6db7cfc8efd..922c865a0d5 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -97,7 +97,8 @@ class Mem_IStream : public Imf::IStream public: Mem_IStream (unsigned char *exrbuf, size_t exrsize) : - IStream("dummy"), _exrpos(0), _exrsize(exrsize) { + IStream("dummy"), _exrpos(0), _exrsize(exrsize) + { _exrbuf = exrbuf; } |