diff options
author | David Marcec <dmarcecguzman@gmail.com> | 2018-08-23 18:18:04 +0200 |
---|---|---|
committer | David Marcec <dmarcecguzman@gmail.com> | 2018-08-23 18:18:04 +0200 |
commit | 78b109d19533af6c10414894cf75b6db1a3801be (patch) | |
tree | e655e957b1bcaff29c9e52ddfedca2db19542377 | |
parent | Added SharedFonts loading via TTF (diff) | |
download | yuzu-78b109d19533af6c10414894cf75b6db1a3801be.tar yuzu-78b109d19533af6c10414894cf75b6db1a3801be.tar.gz yuzu-78b109d19533af6c10414894cf75b6db1a3801be.tar.bz2 yuzu-78b109d19533af6c10414894cf75b6db1a3801be.tar.lz yuzu-78b109d19533af6c10414894cf75b6db1a3801be.tar.xz yuzu-78b109d19533af6c10414894cf75b6db1a3801be.tar.zst yuzu-78b109d19533af6c10414894cf75b6db1a3801be.zip |
-rw-r--r-- | src/core/hle/service/ns/pl_u.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp index 77f6da478..923a52cc5 100644 --- a/src/core/hle/service/ns/pl_u.cpp +++ b/src/core/hle/service/ns/pl_u.cpp @@ -84,7 +84,8 @@ void DecryptSharedFont(const std::vector<u32>& input, std::vector<u8>& output, s 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!"); const u32 KEY = EXPECTED_MAGIC ^ EXPECTED_RESULT; 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; - for (auto FontTTF : SHARED_FONTS_TTF) { - if (FileUtil::Exists(user_path + FontTTF)) { + for (const char* font_ttf : SHARED_FONTS_TTF) { + if (FileUtil::Exists(user_path + font_ttf)) { using_ttf = true; - FileUtil::IOFile file(user_path + FontTTF, "rb"); + FileUtil::IOFile file(user_path + font_ttf, "rb"); if (file.IsOpen()) { std::vector<u8> ttf_bytes(file.GetSize()); 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); SHARED_FONT_REGIONS.push_back(region); } else { - LOG_WARNING(Service_NS, "Unable to load font: {}", FontTTF); + LOG_WARNING(Service_NS, "Unable to load font: {}", font_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) |