diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/file_sys/system_archive/shared_font.cpp | 11 | ||||
| -rw-r--r-- | src/core/hle/service/ns/pl_u.h | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/core/file_sys/system_archive/shared_font.cpp b/src/core/file_sys/system_archive/shared_font.cpp index 8613a39b7..5bb596824 100644 --- a/src/core/file_sys/system_archive/shared_font.cpp +++ b/src/core/file_sys/system_archive/shared_font.cpp | |||
| @@ -18,13 +18,16 @@ namespace { | |||
| 18 | 18 | ||
| 19 | template <std::size_t Size> | 19 | template <std::size_t Size> |
| 20 | VirtualFile PackBFTTF(const std::array<u8, Size>& data, const std::string& name) { | 20 | VirtualFile PackBFTTF(const std::array<u8, Size>& data, const std::string& name) { |
| 21 | std::vector<u32> vec(Size / sizeof(u32)); | 21 | std::vector<u8> vec(Size); |
| 22 | std::memcpy(vec.data(), data.data(), vec.size() * sizeof(u32)); | 22 | std::memcpy(vec.data(), data.data(), vec.size()); |
| 23 | 23 | ||
| 24 | std::vector<u8> bfttf(Size + sizeof(u64)); | 24 | Kernel::PhysicalMemory bfttf(Size + sizeof(u64)); |
| 25 | 25 | ||
| 26 | Service::NS::EncryptSharedFont(vec, bfttf); | 26 | Service::NS::EncryptSharedFont(vec, bfttf); |
| 27 | return std::make_shared<VectorVfsFile>(std::move(bfttf), name); | 27 | |
| 28 | std::vector<u8> bfttf_vec(Size + sizeof(u64)); | ||
| 29 | std::memcpy(bfttf_vec.data(), bfttf.data(), bfttf_vec.size()); | ||
| 30 | return std::make_shared<VectorVfsFile>(std::move(bfttf_vec), name); | ||
| 28 | } | 31 | } |
| 29 | 32 | ||
| 30 | } // Anonymous namespace | 33 | } // Anonymous namespace |
diff --git a/src/core/hle/service/ns/pl_u.h b/src/core/hle/service/ns/pl_u.h index 08574c6b4..7375c1c6f 100644 --- a/src/core/hle/service/ns/pl_u.h +++ b/src/core/hle/service/ns/pl_u.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <memory> | 7 | #include <memory> |
| 8 | #include "core/hle/kernel/physical_memory.h" | ||
| 8 | #include "core/hle/service/service.h" | 9 | #include "core/hle/service/service.h" |
| 9 | 10 | ||
| 10 | namespace Service::NS { | 11 | namespace Service::NS { |