prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
fearlessTobi
2018-09-08 22:51:53 +02:00
parent 51e4bdfaaa
commit e225a64b62
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
externals/CMakeLists.txt vendored
View File

@@ -44,7 +44,7 @@ add_library(microprofile INTERFACE)
target_include_directories(microprofile INTERFACE ./microprofile)
# Open Source Archives
add_subdirectory(open_source_archives)
add_subdirectory(open_source_archives EXCLUDE_FROM_ALL)
# Unicorn
add_library(unicorn-headers INTERFACE)

36
src/core/hle/service/ns/pl_u.cpp
View File

@@ -2,6 +2,13 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <FontChineseSimplified.ttf.h>
#include <FontChineseTraditional.ttf.h>
#include <FontExtendedChineseSimplified.ttf.h>
#include <FontKorean.ttf.h>
#include <FontNintendoExtended.ttf.h>
#include <FontStandard.ttf.h>
#include "common/common_paths.h"
#include "common/file_util.h"
#include "core/core.h"
@@ -13,13 +20,6 @@
#include "core/hle/service/filesystem/filesystem.h"
#include "core/hle/service/ns/pl_u.h"
#include "FontChineseSimplified.ttf.h"
#include "FontChineseTraditional.ttf.h"
#include "FontExtendedChineseSimplified.ttf.h"
#include "FontKorean.ttf.h"
#include "FontNintendoExtended.ttf.h"
#include "FontStandard.ttf.h"
namespace Service::NS {
enum class FontArchives : u64 {
@@ -228,18 +228,18 @@ PL_U::PL_U() : ServiceFramework("pl:u") {
LOG_WARNING(Service_NS,
"Shared Font file missing. Loading open source replacement from memory");
std::vector<std::vector<u8>> open_source_shared_fonts_ttf;
// clang-format off
open_source_shared_fonts_ttf.push_back(std::vector<u8>(std::begin(FontChineseSimplified), std::end(FontChineseSimplified)));
open_source_shared_fonts_ttf.push_back(std::vector<u8>(std::begin(FontChineseTraditional), std::end(FontChineseTraditional)));
open_source_shared_fonts_ttf.push_back(std::vector<u8>(std::begin(FontExtendedChineseSimplified),std::end(FontExtendedChineseSimplified)));
open_source_shared_fonts_ttf.push_back(std::vector<u8>(std::begin(FontKorean), std::end(FontKorean)));
open_source_shared_fonts_ttf.push_back(std::vector<u8>(std::begin(FontNintendoExtended), std::end(FontNintendoExtended)));
open_source_shared_fonts_ttf.push_back(std::vector<u8>(std::begin(FontStandard), std::end(FontStandard)));
// clang-format on
const std::vector<std::vector<u8>> open_source_shared_fonts_ttf = {
{std::begin(FontChineseSimplified), std::end(FontChineseSimplified)},
{std::begin(FontChineseTraditional), std::end(FontChineseTraditional)},
{std::begin(FontExtendedChineseSimplified),
std::end(FontExtendedChineseSimplified)},
{std::begin(FontNintendoExtended), std::end(FontNintendoExtended)},
{std::begin(FontStandard), std::end(FontStandard)},
};
for (std::vector<u8> font_ttf : open_source_shared_fonts_ttf) {
FontRegion region{static_cast<u32>(offset + 8), static_cast<u32>(font_ttf.size())};
for (const std::vector<u8>& font_ttf : open_source_shared_fonts_ttf) {
const FontRegion region{static_cast<u32>(offset + 8),
static_cast<u32>(font_ttf.size())};
EncryptSharedFont(font_ttf, *shared_font, offset);
SHARED_FONT_REGIONS.push_back(region);
}