diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/imbuf/intern/dds/Stream.cpp | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/imbuf/intern/dds/Stream.cpp')
-rw-r--r-- | source/blender/imbuf/intern/dds/Stream.cpp | 107 |
1 files changed, 53 insertions, 54 deletions
diff --git a/source/blender/imbuf/intern/dds/Stream.cpp b/source/blender/imbuf/intern/dds/Stream.cpp index 993fa7734ba..271717f165c 100644 --- a/source/blender/imbuf/intern/dds/Stream.cpp +++ b/source/blender/imbuf/intern/dds/Stream.cpp @@ -18,86 +18,85 @@ * \ingroup imbdds */ - #include <Stream.h> -#include <stdio.h> // printf -#include <string.h> // memcpy +#include <stdio.h> // printf +#include <string.h> // memcpy static const char *msg_error_seek = "DDS: trying to seek beyond end of stream (corrupt file?)"; static const char *msg_error_read = "DDS: trying to read beyond end of stream (corrupt file?)"; unsigned int Stream::seek(unsigned int p) { - if (p > size) { - set_failed(msg_error_seek); - } - else { - pos = p; - } + if (p > size) { + set_failed(msg_error_seek); + } + else { + pos = p; + } - return pos; + return pos; } -unsigned int mem_read(Stream & mem, unsigned long long & i) +unsigned int mem_read(Stream &mem, unsigned long long &i) { - if (mem.pos + 8 > mem.size) { - mem.set_failed(msg_error_seek); - return(0); - } - memcpy(&i, mem.mem + mem.pos, 8); // @@ todo: make sure little endian - mem.pos += 8; - return(8); + if (mem.pos + 8 > mem.size) { + mem.set_failed(msg_error_seek); + return (0); + } + memcpy(&i, mem.mem + mem.pos, 8); // @@ todo: make sure little endian + mem.pos += 8; + return (8); } -unsigned int mem_read(Stream & mem, unsigned int & i) +unsigned int mem_read(Stream &mem, unsigned int &i) { - if (mem.pos + 4 > mem.size) { - mem.set_failed(msg_error_read); - return(0); - } - memcpy(&i, mem.mem + mem.pos, 4); // @@ todo: make sure little endian - mem.pos += 4; - return(4); + if (mem.pos + 4 > mem.size) { + mem.set_failed(msg_error_read); + return (0); + } + memcpy(&i, mem.mem + mem.pos, 4); // @@ todo: make sure little endian + mem.pos += 4; + return (4); } -unsigned int mem_read(Stream & mem, unsigned short & i) +unsigned int mem_read(Stream &mem, unsigned short &i) { - if (mem.pos + 2 > mem.size) { - mem.set_failed(msg_error_read); - return(0); - } - memcpy(&i, mem.mem + mem.pos, 2); // @@ todo: make sure little endian - mem.pos += 2; - return(2); + if (mem.pos + 2 > mem.size) { + mem.set_failed(msg_error_read); + return (0); + } + memcpy(&i, mem.mem + mem.pos, 2); // @@ todo: make sure little endian + mem.pos += 2; + return (2); } -unsigned int mem_read(Stream & mem, unsigned char & i) +unsigned int mem_read(Stream &mem, unsigned char &i) { - if (mem.pos + 1 > mem.size) { - mem.set_failed(msg_error_read); - return(0); - } - i = (mem.mem + mem.pos)[0]; - mem.pos += 1; - return(1); + if (mem.pos + 1 > mem.size) { + mem.set_failed(msg_error_read); + return (0); + } + i = (mem.mem + mem.pos)[0]; + mem.pos += 1; + return (1); } -unsigned int mem_read(Stream & mem, unsigned char *i, unsigned int cnt) +unsigned int mem_read(Stream &mem, unsigned char *i, unsigned int cnt) { - if (mem.pos + cnt > mem.size) { - mem.set_failed(msg_error_read); - return(0); - } - memcpy(i, mem.mem + mem.pos, cnt); - mem.pos += cnt; - return(cnt); + if (mem.pos + cnt > mem.size) { + mem.set_failed(msg_error_read); + return (0); + } + memcpy(i, mem.mem + mem.pos, cnt); + mem.pos += cnt; + return (cnt); } void Stream::set_failed(const char *msg) { - if (!failed) { - puts(msg); - failed = true; - } + if (!failed) { + puts(msg); + failed = true; + } } |