libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Fix performance issues in Encoding when checking endianness

Browse Source
This commit is contained in:
Thierry Crozat 2020-10-03 23:01:21 +01:00
parent 8555463758
commit 64f727ca3d
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
common/encoding.cpp
View File

@ -44,7 +44,7 @@ String addUtfEndianness(const String &str) {
return str + "LE";
#endif
} else
return String(str);
return str;
}
Encoding::Encoding(const String &to, const String &from)
@ -98,19 +98,33 @@ char *Encoding::convertWithTransliteration(const String &to, const String &from,
return result;
}
if ((addUtfEndianness(to).equalsIgnoreCase("utf-16be") &&
addUtfEndianness(from).equalsIgnoreCase("utf-16le")) ||
(addUtfEndianness(to).equalsIgnoreCase("utf-16le") &&
addUtfEndianness(from).equalsIgnoreCase("utf-16be")) ||
(addUtfEndianness(to).equalsIgnoreCase("utf-32be") &&
addUtfEndianness(from).equalsIgnoreCase("utf-32le")) ||
(addUtfEndianness(to).equalsIgnoreCase("utf-32le") &&
addUtfEndianness(from).equalsIgnoreCase("utf-32be"))) {
// The encoding is the same, we just need to switch the endianness
if (to.hasPrefixIgnoreCase("utf-16"))
return switchEndian(string, length, 16);
else
return switchEndian(string, length, 32);
if ((to.hasPrefixIgnoreCase("utf-16") && from.hasPrefixIgnoreCase("utf-16")) ||
(to.hasPrefixIgnoreCase("utf-32") && from.hasPrefixIgnoreCase("utf-32"))) {
// Since the two strings are not equal as this is already checked above,
// this likely mean that one or both has an endianness suffix, and we
// just need to switch the endianess.
#ifdef SCUMM_BIG_ENDIAN
bool fromBigEndian = !from.hasSuffixIgnoreCase("le");
bool toBigEndian = !to.hasSuffixIgnoreCase("le");
#else
bool fromBigEndian = from.hasSuffixIgnoreCase("be");
bool toBigEndian = to.hasSuffixIgnoreCase("be");
#endif
if (fromBigEndian == toBigEndian) {
// don't convert, just copy the string and return it
char *result = (char *)calloc(sizeof(char), length + 4);
if (!result) {
warning("Could not allocate memory for string conversion");
return nullptr;
}
memcpy(result, string, length);
return result;
} else {
if (to.hasPrefixIgnoreCase("utf-16"))
return switchEndian(string, length, 16);
else
return switchEndian(string, length, 32);
}
}
char *newString = nullptr;