diff options
| author |  Lioncash | 2018-10-09 13:18:20 -0400 |
|---|---|---|
| committer | Lioncash | 2018-10-09 13:18:23 -0400 |
| commit | 567e81844038b82e66bf1566c16bca87026ee6e4 (patch) | |
| tree | ef77bf64ae056cf839f163a00305ddd2444c43c9 | |
| parent | Merge pull request #1423 from DarkLordZach/romfs-file-exts (diff) | |
| download | yuzu-567e81844038b82e66bf1566c16bca87026ee6e4.tar.gz yuzu-567e81844038b82e66bf1566c16bca87026ee6e4.tar.xz yuzu-567e81844038b82e66bf1566c16bca87026ee6e4.zip | |
ips_layer: Silence truncation and conversion warnings
Makes type conversions explicit to avoid compiler warnings.
Diffstat (limited to '')
| -rw-r--r-- | src/core/file_sys/ips_layer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/file_sys/ips_layer.cpp b/src/core/file_sys/ips_layer.cpp index 0cadbc375..184509716 100644 --- a/src/core/file_sys/ips_layer.cpp +++ b/src/core/file_sys/ips_layer.cpp | |||
| @@ -76,12 +76,12 @@ VirtualFile PatchIPS(const VirtualFile& in, const VirtualFile& ips) { | |||
| 76 | return nullptr; | 76 | return nullptr; |
| 77 | 77 | ||
| 78 | if (real_offset + rle_size > in_data.size()) | 78 | if (real_offset + rle_size > in_data.size()) |
| 79 | rle_size = in_data.size() - real_offset; | 79 | rle_size = static_cast<u16>(in_data.size() - real_offset); |
| 80 | std::memset(in_data.data() + real_offset, data.get(), rle_size); | 80 | std::memset(in_data.data() + real_offset, data.get(), rle_size); |
| 81 | } else { // Standard Patch | 81 | } else { // Standard Patch |
| 82 | auto read = data_size; | 82 | auto read = data_size; |
| 83 | if (real_offset + read > in_data.size()) | 83 | if (real_offset + read > in_data.size()) |
| 84 | read = in_data.size() - real_offset; | 84 | read = static_cast<u16>(in_data.size() - real_offset); |
| 85 | if (ips->Read(in_data.data() + real_offset, read, offset) != data_size) | 85 | if (ips->Read(in_data.data() + real_offset, read, offset) != data_size) |
| 86 | return nullptr; | 86 | return nullptr; |
| 87 | offset += data_size; | 87 | offset += data_size; |
| @@ -225,7 +225,7 @@ void IPSwitchCompiler::Parse() { | |||
| 225 | if (patch_line.length() < 11) | 225 | if (patch_line.length() < 11) |
| 226 | break; | 226 | break; |
| 227 | auto offset = std::stoul(patch_line.substr(0, 8), nullptr, 16); | 227 | auto offset = std::stoul(patch_line.substr(0, 8), nullptr, 16); |
| 228 | offset += offset_shift; | 228 | offset += static_cast<unsigned long>(offset_shift); |
| 229 | 229 | ||
| 230 | std::vector<u8> replace; | 230 | std::vector<u8> replace; |
| 231 | // 9 - first char of replacement val | 231 | // 9 - first char of replacement val |