diff options
| author | Campbell Barton <campbell@blender.org> | 2022-09-13 09:29:06 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-09-13 09:29:06 +0300 |
| commit | 4d69b6f525a4f02a24141e61f16e90455f3f0a30 (patch) | |
| tree | 44cbbef93dc0ed5ea3d76827f2bb63c7f50d5620 /source/blender/imbuf/intern/dds/Stream.cpp | |
| parent | 75f9b691e209bc3d09383d733b11a08d2bcfdbc3 (diff) | |
Cleanup: use u-prefixed integer types (for brevity)
Diffstat (limited to 'source/blender/imbuf/intern/dds/Stream.cpp')
| -rw-r--r-- | source/blender/imbuf/intern/dds/Stream.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/imbuf/intern/dds/Stream.cpp b/source/blender/imbuf/intern/dds/Stream.cpp index 566891dac8b..44b7e6d8f42 100644 --- a/source/blender/imbuf/intern/dds/Stream.cpp +++ b/source/blender/imbuf/intern/dds/Stream.cpp @@ -4,6 +4,8 @@ * \ingroup imbdds */ +#include "BLI_sys_types.h" /* For `uint`. */ + #include <Stream.h> #include <cstdio> /* printf */ @@ -12,7 +14,7 @@ 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?)"; -inline bool is_read_within_bounds(const Stream &mem, unsigned int count) +inline bool is_read_within_bounds(const Stream &mem, uint count) { if (mem.pos >= mem.size) { /* No more data remained in the memory buffer. */ @@ -27,7 +29,7 @@ inline bool is_read_within_bounds(const Stream &mem, unsigned int count) return true; } -unsigned int Stream::seek(unsigned int p) +uint Stream::seek(uint p) { if (p > size) { set_failed(msg_error_seek); @@ -39,7 +41,7 @@ unsigned int Stream::seek(unsigned int p) return pos; } -unsigned int mem_read(Stream &mem, unsigned long long &i) +uint mem_read(Stream &mem, unsigned long long &i) { if (!is_read_within_bounds(mem, 8)) { mem.set_failed(msg_error_seek); @@ -50,7 +52,7 @@ unsigned int mem_read(Stream &mem, unsigned long long &i) return 8; } -unsigned int mem_read(Stream &mem, unsigned int &i) +uint mem_read(Stream &mem, uint &i) { if (!is_read_within_bounds(mem, 4)) { mem.set_failed(msg_error_read); @@ -61,7 +63,7 @@ unsigned int mem_read(Stream &mem, unsigned int &i) return 4; } -unsigned int mem_read(Stream &mem, unsigned short &i) +uint mem_read(Stream &mem, ushort &i) { if (!is_read_within_bounds(mem, 2)) { mem.set_failed(msg_error_read); @@ -72,7 +74,7 @@ unsigned int mem_read(Stream &mem, unsigned short &i) return 2; } -unsigned int mem_read(Stream &mem, unsigned char &i) +uint mem_read(Stream &mem, uchar &i) { if (!is_read_within_bounds(mem, 1)) { mem.set_failed(msg_error_read); @@ -83,7 +85,7 @@ unsigned int mem_read(Stream &mem, unsigned char &i) return 1; } -unsigned int mem_read(Stream &mem, unsigned char *i, unsigned int count) +uint mem_read(Stream &mem, uchar *i, uint count) { if (!is_read_within_bounds(mem, count)) { mem.set_failed(msg_error_read); |