etc/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1461 from lioncash/warn

Browse source 
ips_layer: Silence truncation and conversion warnings
This commit is contained in:
bunnei 2018-10-09 22:30:01 -04:00 committed by GitHub
commit 5461b21c7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/file_sys/ips_layer.cpp
View file

@ -107,12 +107,12 @@ VirtualFile PatchIPS(const VirtualFile& in, const VirtualFile& ips) {
return nullptr; return nullptr;
if (real_offset + rle_size > in_data.size()) if (real_offset + rle_size > in_data.size())
rle_size = in_data.size() - real_offset; rle_size = static_cast<u16>(in_data.size() - real_offset);
std::memset(in_data.data() + real_offset, data.get(), rle_size); std::memset(in_data.data() + real_offset, data.get(), rle_size);
} else { // Standard Patch } else { // Standard Patch
auto read = data_size; auto read = data_size;
if (real_offset + read > in_data.size()) if (real_offset + read > in_data.size())
read = in_data.size() - real_offset; read = static_cast<u16>(in_data.size() - real_offset);
if (ips->Read(in_data.data() + real_offset, read, offset) != data_size) if (ips->Read(in_data.data() + real_offset, read, offset) != data_size)
return nullptr; return nullptr;
offset += data_size; offset += data_size;
@ -265,7 +265,7 @@ void IPSwitchCompiler::Parse() {
if (patch_line.length() < 11) if (patch_line.length() < 11)
break; break;
auto offset = std::stoul(patch_line.substr(0, 8), nullptr, 16); auto offset = std::stoul(patch_line.substr(0, 8), nullptr, 16);
offset += offset_shift; offset += static_cast<unsigned long>(offset_shift);
std::vector<u8> replace; std::vector<u8> replace;
// 9 - first char of replacement val // 9 - first char of replacement val