thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

JANITORIAL: Whitespace fixes

Browse source
This commit is contained in:
Eugene Sandulenko 2019-12-13 00:02:38 +01:00
parent 4b0fcd411b
commit 5825a30b67
2 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/encoding.cpp
View file

@ -47,7 +47,7 @@ String addUtfEndianness(const String &str) {
return String(str);
}
Encoding::Encoding(const String &to, const String &from)
Encoding::Encoding(const String &to, const String &from)
: _to(to)
, _from(from) {
}

66
common/str-enc.cpp
View file

@ -37,7 +37,7 @@ namespace Common {
//
// More comprehensive one lives in wintermute/utils/convert_utf.cpp
void String::decodeUTF8(U32String &dst) const {
// The String class, and therefore the Font class as well, assume one
// The String class, and therefore the Font class as well, assume one
// character is one byte, but in this case it's actually an UTF-8
// string with up to 4 bytes per character. To work around this,
// convert it to an U32String before drawing it, because our Font class
@ -48,40 +48,40 @@ void String::decodeUTF8(U32String &dst) const {
uint num = 1;
if ((_str[i] & 0xF8) == 0xF0) {
num = 4;
num = 4;
} else if ((_str[i] & 0xF0) == 0xE0) {
num = 3;
} else if ((_str[i] & 0xE0) == 0xC0) {
num = 2;
num = 3;
} else if ((_str[i] & 0xE0) == 0xC0) {
num = 2;
}
if (i - _size >= num) {
switch (num) {
case 4:
chr |= (_str[i++] & 0x07) << 18;
chr |= (_str[i++] & 0x3F) << 12;
chr |= (_str[i++] & 0x3F) << 6;
chr |= (_str[i++] & 0x3F);
break;
switch (num) {
case 4:
chr |= (_str[i++] & 0x07) << 18;
chr |= (_str[i++] & 0x3F) << 12;
chr |= (_str[i++] & 0x3F) << 6;
chr |= (_str[i++] & 0x3F);
break;
case 3:
chr |= (_str[i++] & 0x0F) << 12;
chr |= (_str[i++] & 0x3F) << 6;
chr |= (_str[i++] & 0x3F);
break;
case 3:
chr |= (_str[i++] & 0x0F) << 12;
chr |= (_str[i++] & 0x3F) << 6;
chr |= (_str[i++] & 0x3F);
break;
case 2:
chr |= (_str[i++] & 0x1F) << 6;
chr |= (_str[i++] & 0x3F);
break;
case 2:
chr |= (_str[i++] & 0x1F) << 6;
chr |= (_str[i++] & 0x3F);
break;
default:
chr = (_str[i++] & 0x7F);
break;
}
} else {
break;
}
default:
chr = (_str[i++] & 0x7F);
break;
}
} else {
break;
}
dst += chr;
}
@ -283,7 +283,7 @@ static char const *const g_codePageMap[] = {
};
void String::decodeOneByte(U32String &dst, CodePage page) const {
for (uint i = 0; i < _size; ++i) {
for (uint i = 0; i < _size; ++i) {
if ((byte)_str[i] <= 0x7F) {
dst += _str[i];
continue;
@ -321,7 +321,7 @@ void String::decodeOneByte(U32String &dst, CodePage page) const {
U32String String::decode(CodePage page) const {
if (page == kCodePageInvalid ||
page >= ARRAYSIZE(g_codePageMap)) {
page >= ARRAYSIZE(g_codePageMap)) {
error("Invalid codepage");
}
char *result = Encoding::convert("UTF-32", g_codePageMap[page], _str, _size);
@ -392,7 +392,7 @@ void U32String::encodeOneByte(String &dst, CodePage page) const {
String U32String::encode(CodePage page) const {
if (page == kCodePageInvalid ||
page >= ARRAYSIZE(g_codePageMap)) {
page >= ARRAYSIZE(g_codePageMap)) {
error("Invalid codepage");
}
char *result = Encoding::convert(g_codePageMap[page], "UTF-32", (const char *)_str, _size * 4);
@ -424,11 +424,11 @@ U32String convertUtf8ToUtf32(const String &str) {
}
String convertFromU32String(const U32String &string, CodePage page) {
return string.encode(page);
return string.encode(page);
}
String convertUtf32ToUtf8(const U32String &u32str) {
return u32str.encode(kUtf8);
return u32str.encode(kUtf8);
}
} // End of namespace Common