Merge pull request #1307 from lioncash/pl

services/pl_u: Add missing Korean font to the fallback case for shared fonts
merge-requests/60/head
bunnei 2018-09-13 19:49:39 +07:00 committed by GitHub
commit 3ef134a092
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions

@ -253,14 +253,16 @@ PL_U::PL_U() : ServiceFramework("pl:u"), impl{std::make_unique<Impl>()} {
LOG_WARNING(Service_NS, LOG_WARNING(Service_NS,
"Shared Font file missing. Loading open source replacement from memory"); "Shared Font file missing. Loading open source replacement from memory");
// clang-format off
const std::vector<std::vector<u8>> open_source_shared_fonts_ttf = { const std::vector<std::vector<u8>> open_source_shared_fonts_ttf = {
{std::begin(FontChineseSimplified), std::end(FontChineseSimplified)}, {std::begin(FontChineseSimplified), std::end(FontChineseSimplified)},
{std::begin(FontChineseTraditional), std::end(FontChineseTraditional)}, {std::begin(FontChineseTraditional), std::end(FontChineseTraditional)},
{std::begin(FontExtendedChineseSimplified), {std::begin(FontExtendedChineseSimplified), std::end(FontExtendedChineseSimplified)},
std::end(FontExtendedChineseSimplified)}, {std::begin(FontKorean), std::end(FontKorean)},
{std::begin(FontNintendoExtended), std::end(FontNintendoExtended)}, {std::begin(FontNintendoExtended), std::end(FontNintendoExtended)},
{std::begin(FontStandard), std::end(FontStandard)}, {std::begin(FontStandard), std::end(FontStandard)},
}; };
// clang-format on
for (const std::vector<u8>& font_ttf : open_source_shared_fonts_ttf) { for (const std::vector<u8>& font_ttf : open_source_shared_fonts_ttf) {
const FontRegion region{static_cast<u32>(offset + 8), const FontRegion region{static_cast<u32>(offset + 8),