OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Backend update from Raze.

Browse source
This commit is contained in:
Christoph Oelckers 2023-10-07 18:42:24 +02:00
commit 89535b803a
74 changed files with 506 additions and 402 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/common/filesystem/source/files_decompress.cpp
View file

@ -176,7 +176,7 @@ public:
ptrdiff_t Read (void *buffer, ptrdiff_t len) override
{
int err;
int err = 0;
if (File == nullptr)
{
@ -188,7 +188,7 @@ public:
while (len > 0)
{
Stream.next_out = (Bytef*)buffer;
auto rlen = std::min<ptrdiff_t>(len, 0x40000000);
unsigned rlen = (unsigned)std::min<ptrdiff_t>(len, 0x40000000);
Stream.avail_out = rlen;
buffer = Stream.next_out + rlen;
len -= rlen;
@ -304,7 +304,7 @@ public:
while (len > 0)
{
Stream.next_out = (char*)buffer;
auto rlen = std::min<ptrdiff_t>(len, 0x40000000);
unsigned rlen = (unsigned)std::min<ptrdiff_t>(len, 0x40000000);
Stream.avail_out = rlen;
buffer = Stream.next_out + rlen;
len -= rlen;
@ -798,7 +798,7 @@ public:
if (len > 0xffffffff) len = 0xffffffff; // this format cannot be larger than 4GB.
uint8_t *Out = (uint8_t*)buffer;
unsigned AvailOut = len;
ptrdiff_t AvailOut = len;
do
{
@ -812,7 +812,7 @@ public:
break;
}
unsigned int copy = std::min<unsigned int>(Stream.InternalOut, AvailOut);
unsigned int copy = (unsigned)std::min<ptrdiff_t>(Stream.InternalOut, AvailOut);
if(copy > 0)
{
memcpy(Out, Stream.WindowData, copy);