zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-26 06:11:53 +00:00
Code Activity

refactor: fix remaining x64 compilation issues

Browse Source
This commit is contained in:
Jan
2025-04-26 12:38:43 +01:00
committed by Jan Laupetin
parent a6107e24a2
commit 365b627523
20 changed files with 128 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ZoneWriting/Writing/Processor/OutputProcessorDeflate.cpp
View File

@ -10,12 +10,6 @@
class OutputProcessorDeflate::Impl
{
z_stream m_stream{};
OutputProcessorDeflate* m_base;
std::unique_ptr<uint8_t[]> m_buffer;
size_t m_buffer_size;
public:
Impl(OutputProcessorDeflate* baseClass, const size_t bufferSize)
: m_buffer(std::make_unique<uint8_t[]>(bufferSize)),
@ -29,7 +23,7 @@ public:
m_stream.avail_in = 0;
m_stream.next_in = Z_NULL;
m_stream.next_out = m_buffer.get();
m_stream.avail_out = m_buffer_size;
m_stream.avail_out = static_cast<unsigned>(m_buffer_size);
const int ret = deflateInit(&m_stream, Z_DEFAULT_COMPRESSION);
@ -52,7 +46,7 @@ public:
void Write(const void* buffer, const size_t length)
{
m_stream.next_in = static_cast<const Bytef*>(buffer);
m_stream.avail_in = length;
m_stream.avail_in = static_cast<unsigned>(length);
while (m_stream.avail_in > 0)
{
@ -60,7 +54,7 @@ public:
{
m_base->m_base_stream->Write(m_buffer.get(), m_buffer_size);
m_stream.next_out = m_buffer.get();
m_stream.avail_out = m_buffer_size;
m_stream.avail_out = static_cast<unsigned>(m_buffer_size);
}
const auto ret = deflate(&m_stream, Z_NO_FLUSH);
@ -79,7 +73,7 @@ public:
{
m_base->m_base_stream->Write(m_buffer.get(), m_buffer_size - m_stream.avail_out);
m_stream.next_out = m_buffer.get();
m_stream.avail_out = m_buffer_size;
m_stream.avail_out = static_cast<unsigned>(m_buffer_size);
}
const auto ret = deflate(&m_stream, Z_FINISH);
@ -96,14 +90,21 @@ public:
{
m_base->m_base_stream->Write(m_buffer.get(), m_buffer_size - m_stream.avail_out);
m_stream.next_out = m_buffer.get();
m_stream.avail_out = m_buffer_size;
m_stream.avail_out = static_cast<unsigned>(m_buffer_size);
}
}
_NODISCARD int64_t Pos() const
[[nodiscard]] int64_t Pos() const
{
return m_base->m_base_stream->Pos();
}
private:
z_stream m_stream{};
OutputProcessorDeflate* m_base;
std::unique_ptr<uint8_t[]> m_buffer;
size_t m_buffer_size;
};
OutputProcessorDeflate::OutputProcessorDeflate()

2
src/ZoneWriting/Writing/Processor/OutputProcessorDeflate.h
View File

@ -13,7 +13,7 @@ class OutputProcessorDeflate final : public OutputStreamProcessor
public:
OutputProcessorDeflate();
OutputProcessorDeflate(size_t bufferSize);
explicit OutputProcessorDeflate(size_t bufferSize);
~OutputProcessorDeflate() override;
OutputProcessorDeflate(const OutputProcessorDeflate& other) = delete;
OutputProcessorDeflate(OutputProcessorDeflate&& other) noexcept = default;

4
src/ZoneWriting/Writing/Steps/StepWriteZero.cpp
View File

@ -9,10 +9,10 @@ StepWriteZero::StepWriteZero(const size_t count)
void StepWriteZero::PerformStep(ZoneWriter* zoneWriter, IWritingStream* stream)
{
const uint64_t num = 0;
constexpr uint64_t num = 0;
size_t toWrite;
for (auto i = 0u; i < m_count; i += toWrite)
for (auto i = 0uz; i < m_count; i += toWrite)
{
toWrite = std::min(sizeof(uint64_t), m_count - i);
stream->Write(&num, toWrite);

2
src/ZoneWriting/Zone/Stream/IZoneOutputStream.h
View File

@ -43,7 +43,7 @@ public:
return static_cast<T*>(WriteDataInBlock(reinterpret_cast<const void*>(dst), sizeof(T)));
}
template<typename T> T* Write(T* dst, const uint32_t count)
template<typename T> T* Write(T* dst, const size_t count)
{
return static_cast<T*>(WriteDataInBlock(reinterpret_cast<const void*>(dst), count * sizeof(T)));
}