INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-27 23:27:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix compilation issues with x64

Browse Source
This commit is contained in:
Jan
2025-04-06 13:50:04 +02:00
parent 37d52ae8da
commit 6f31e8cc29
32 changed files with 150 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ObjCommon/ObjContainer/IPak/IPakTypes.h
View File

@ -16,7 +16,7 @@ namespace ipak_consts
static constexpr size_t IPAK_CHUNK_SIZE = 0x8000;
static constexpr size_t IPAK_CHUNK_COUNT_PER_READ = 0x8;
static constexpr uint32_t IPAK_COMMAND_DEFAULT_SIZE = 0x7F00;
static constexpr size_t IPAK_COMMAND_DEFAULT_SIZE = 0x7F00;
static constexpr uint32_t IPAK_COMMAND_UNCOMPRESSED = 0;
static constexpr uint32_t IPAK_COMMAND_COMPRESSED = 1;
static constexpr uint32_t IPAK_COMMAND_SKIP = 0xCF;

4
src/ObjCommon/Sound/FlacDecoder.cpp
View File

@ -68,7 +68,7 @@ namespace
T result;
} data{};
const auto byteCount = utils::Align(bitCount, 8u) / 8u;
const auto byteCount = utils::Align(bitCount, 8uz) / 8uz;
assert(byteCount <= sizeof(T));
const auto shiftCount = (8u - bitCount % 8) % 8;
@ -83,7 +83,7 @@ namespace
while (remainingBits > 0)
{
const auto curBits = static_cast<uint8_t>(std::min(remainingBits, 8u));
const auto curBits = static_cast<uint8_t>(std::min(remainingBits, 8uz));
if (m_remaining_bits_last_byte > 0)
{

4
src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.cpp
View File

@ -59,7 +59,7 @@ size_t CommonStructuredDataType::GetSizeInBits(const CommonStructuredDataDef& de
return 0u;
}
const auto& indexedArray = def.m_indexed_arrays[m_info.type_index];
return utils::Align(indexedArray.m_element_size_in_bits * indexedArray.m_element_count, 8u);
return utils::Align(indexedArray.m_element_size_in_bits * indexedArray.m_element_count, 8uz);
}
case CommonStructuredDataTypeCategory::ENUM_ARRAY:
{
@ -69,7 +69,7 @@ size_t CommonStructuredDataType::GetSizeInBits(const CommonStructuredDataDef& de
return 0u;
}
const auto& enumedArray = def.m_enumed_arrays[m_info.type_index];
return utils::Align(enumedArray.m_element_size_in_bits * enumedArray.m_element_count, 8u);
return utils::Align(enumedArray.m_element_size_in_bits * enumedArray.m_element_count, 8uz);
}
case CommonStructuredDataTypeCategory::UNKNOWN: