Exverge/suyu
3
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Addressed plu TTF changes

Browse source
This commit is contained in:
David Marcec 2018-08-24 02:18:04 +10:00
parent eccc77a8c8
commit 78b109d195
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/hle/service/ns/pl_u.cpp
View file

@ -84,7 +84,8 @@ void DecryptSharedFont(const std::vector<u32>& input, std::vector<u8>& output, s
offset += transformed_font.size() * sizeof(u32); offset += transformed_font.size() * sizeof(u32);
} }
void EncryptSharedFont(const std::vector<u8>& input, std::vector<u8>& output, size_t& offset) { static void EncryptSharedFont(const std::vector<u8>& input, std::vector<u8>& output,
size_t& offset) {
ASSERT_MSG(offset + input.size() + 8 < SHARED_FONT_MEM_SIZE, "Shared fonts exceeds 17mb!"); ASSERT_MSG(offset + input.size() + 8 < SHARED_FONT_MEM_SIZE, "Shared fonts exceeds 17mb!");
const u32 KEY = EXPECTED_MAGIC ^ EXPECTED_RESULT; const u32 KEY = EXPECTED_MAGIC ^ EXPECTED_RESULT;
std::memcpy(output.data() + offset, &EXPECTED_RESULT, sizeof(u32)); // Magic header std::memcpy(output.data() + offset, &EXPECTED_RESULT, sizeof(u32)); // Magic header
@ -185,10 +186,10 @@ PL_U::PL_U() : ServiceFramework("pl:u") {
} }
bool using_ttf = false; bool using_ttf = false;
for (auto FontTTF : SHARED_FONTS_TTF) { for (const char* font_ttf : SHARED_FONTS_TTF) {
if (FileUtil::Exists(user_path + FontTTF)) { if (FileUtil::Exists(user_path + font_ttf)) {
using_ttf = true; using_ttf = true;
FileUtil::IOFile file(user_path + FontTTF, "rb"); FileUtil::IOFile file(user_path + font_ttf, "rb");
if (file.IsOpen()) { if (file.IsOpen()) {
std::vector<u8> ttf_bytes(file.GetSize()); std::vector<u8> ttf_bytes(file.GetSize());
file.ReadBytes<u8>(ttf_bytes.data(), ttf_bytes.size()); file.ReadBytes<u8>(ttf_bytes.data(), ttf_bytes.size());
@ -199,10 +200,10 @@ PL_U::PL_U() : ServiceFramework("pl:u") {
EncryptSharedFont(ttf_bytes, *shared_font, offset); EncryptSharedFont(ttf_bytes, *shared_font, offset);
SHARED_FONT_REGIONS.push_back(region); SHARED_FONT_REGIONS.push_back(region);
} else { } else {
LOG_WARNING(Service_NS, "Unable to load font: {}", FontTTF); LOG_WARNING(Service_NS, "Unable to load font: {}", font_ttf);
} }
} else if (using_ttf) { } else if (using_ttf) {
LOG_WARNING(Service_NS, "Unable to find font: {}", FontTTF); LOG_WARNING(Service_NS, "Unable to find font: {}", font_ttf);
} }
} }
if (using_ttf) if (using_ttf)