From 826ac205d83cb262eace59c2c13e0fb5a4dae57d Mon Sep 17 00:00:00 2001 From: Pengfei Zhu Date: Fri, 1 Jul 2022 23:52:14 +0800 Subject: [PATCH] More MSVC warnings --- src/core/cia_builder.cpp | 4 ++-- src/core/file_sys/ncch_container.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/cia_builder.cpp b/src/core/cia_builder.cpp index a896c04..00e4c02 100644 --- a/src/core/cia_builder.cpp +++ b/src/core/cia_builder.cpp @@ -117,7 +117,7 @@ bool CIABuilder::Init(CIABuildType type_, const std::string& destination, TitleM // TMD will be written in Finalize (we need to set content hash, etc) tmd_offset = Common::AlignUp(ticket_offset + header.tik_size, CIA_ALIGNMENT); - header.tmd_size = tmd.GetSize(); + header.tmd_size = static_cast(tmd.GetSize()); content_offset = Common::AlignUp(tmd_offset + header.tmd_size, CIA_ALIGNMENT); header.content_size = 0; @@ -221,7 +221,7 @@ bool CIABuilder::WriteTicket() { } title_key = GetTitleKey(ticket); - header.tik_size = ticket.GetSize(); + header.tik_size = static_cast(ticket.GetSize()); file->Seek(ticket_offset, SEEK_SET); if (!ticket.Save(*file)) { diff --git a/src/core/file_sys/ncch_container.cpp b/src/core/file_sys/ncch_container.cpp index 1888296..100a2a7 100644 --- a/src/core/file_sys/ncch_container.cpp +++ b/src/core/file_sys/ncch_container.cpp @@ -607,8 +607,9 @@ std::vector LoadSharedRomFS(const std::vector& data) { std::vector result(ivfc.levels[2].size); // Calculation from ctrtool - const std::size_t data_offset = offset + Common::AlignUp(sizeof(ivfc) + ivfc.master_hash_size, - (1 << ivfc.levels[2].block_size)); + const std::size_t data_offset = + offset + Common::AlignUp(sizeof(ivfc) + ivfc.master_hash_size, + (1 << static_cast(ivfc.levels[2].block_size))); if (!CheckedMemcpy(result.data(), data, data_offset, ivfc.levels[2].size)) { return {}; }