forked from mirror/OpenTTD
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
This commit is contained in:
10
src/bmp.cpp
10
src/bmp.cpp
@@ -48,15 +48,15 @@ static inline byte ReadByte(BmpBuffer *buffer)
|
||||
return buffer->data[buffer->pos++];
|
||||
}
|
||||
|
||||
static inline uint16 ReadWord(BmpBuffer *buffer)
|
||||
static inline uint16_t ReadWord(BmpBuffer *buffer)
|
||||
{
|
||||
uint16 var = ReadByte(buffer);
|
||||
uint16_t var = ReadByte(buffer);
|
||||
return var | (ReadByte(buffer) << 8);
|
||||
}
|
||||
|
||||
static inline uint32 ReadDword(BmpBuffer *buffer)
|
||||
static inline uint32_t ReadDword(BmpBuffer *buffer)
|
||||
{
|
||||
uint32 var = ReadWord(buffer);
|
||||
uint32_t var = ReadWord(buffer);
|
||||
return var | (ReadWord(buffer) << 16);
|
||||
}
|
||||
|
||||
@@ -316,7 +316,7 @@ static inline bool BmpRead24(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
|
||||
*/
|
||||
bool BmpReadHeader(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
|
||||
{
|
||||
uint32 header_size;
|
||||
uint32_t header_size;
|
||||
assert(info != nullptr);
|
||||
MemSetT(info, 0);
|
||||
|
||||
|
Reference in New Issue
Block a user