diff options
| author | 2019-02-08 06:45:50 +0100 | |
|---|---|---|
| committer | 2019-03-29 18:12:42 +0100 | |
| commit | c791192d649cf01483dbea9907c6d13909b8e5a3 (patch) | |
| tree | 1b62eaf1f16edfe93ce84c61bed9357d55e1e4e6 /src/core/loader/nso.cpp | |
| parent | core: Do not link LZ4 to core. Use common/data_compression for nso segment de... (diff) | |
| download | yuzu-c791192d649cf01483dbea9907c6d13909b8e5a3.tar.gz yuzu-c791192d649cf01483dbea9907c6d13909b8e5a3.tar.xz yuzu-c791192d649cf01483dbea9907c6d13909b8e5a3.zip | |
Addressed feedback
Diffstat (limited to 'src/core/loader/nso.cpp')
| -rw-r--r-- | src/core/loader/nso.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 8aeabe409..df2fb7b7f 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp | |||
| @@ -5,11 +5,11 @@ | |||
| 5 | #include <cinttypes> | 5 | #include <cinttypes> |
| 6 | #include <vector> | 6 | #include <vector> |
| 7 | 7 | ||
| 8 | #include "common/data_compression.h" | ||
| 9 | #include "common/common_funcs.h" | 8 | #include "common/common_funcs.h" |
| 10 | #include "common/file_util.h" | 9 | #include "common/file_util.h" |
| 11 | #include "common/hex_util.h" | 10 | #include "common/hex_util.h" |
| 12 | #include "common/logging/log.h" | 11 | #include "common/logging/log.h" |
| 12 | #include "common/lz4_compression.h" | ||
| 13 | #include "common/swap.h" | 13 | #include "common/swap.h" |
| 14 | #include "core/core.h" | 14 | #include "core/core.h" |
| 15 | #include "core/file_sys/patch_manager.h" | 15 | #include "core/file_sys/patch_manager.h" |
| @@ -37,10 +37,10 @@ static_assert(sizeof(MODHeader) == 0x1c, "MODHeader has incorrect size."); | |||
| 37 | std::vector<u8> DecompressSegment(const std::vector<u8>& compressed_data, | 37 | std::vector<u8> DecompressSegment(const std::vector<u8>& compressed_data, |
| 38 | const NSOSegmentHeader& header) { | 38 | const NSOSegmentHeader& header) { |
| 39 | const std::vector<u8> uncompressed_data = | 39 | const std::vector<u8> uncompressed_data = |
| 40 | Compression::DecompressDataLZ4(compressed_data, header.size); | 40 | Common::Compression::DecompressDataLZ4(compressed_data, header.size); |
| 41 | 41 | ||
| 42 | ASSERT_MSG(uncompressed_data.size() == static_cast<int>(header.size), | 42 | ASSERT_MSG(uncompressed_data.size() == static_cast<int>(header.size), "{} != {}", header.size, |
| 43 | "{} != {}", header.size, uncompressed_data.size()); | 43 | uncompressed_data.size()); |
| 44 | 44 | ||
| 45 | return uncompressed_data; | 45 | return uncompressed_data; |
| 46 | } | 46 | } |