mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove util_zlib_deflate()

This commit is contained in:
Gymnasiast 2022-01-24 22:00:37 +01:00
parent 93f3e94b3f
commit 615c07977d
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
2 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/openrct2/util/Util.cpp
View File

@ -547,37 +547,6 @@ uint32_t util_rand()
constexpr size_t CHUNK = 128 * 1024;
constexpr int32_t MAX_ZLIB_REALLOC = 4 * 1024 * 1024;
/**
* @brief Deflates input using zlib
* @param data Data to be compressed
* @param data_in_size Size of data to be compressed
* @return Returns an optional std::vector of bytes, which is equal to std::nullopt when deflate has failed
*/
std::optional<std::vector<uint8_t>> util_zlib_deflate(const uint8_t* data, size_t data_in_size)
{
int32_t ret = Z_OK;
uLongf out_size = 0;
uLong buffer_size = compressBound(static_cast<uLong>(data_in_size));
std::vector<uint8_t> buffer(buffer_size);
do
{
if (ret == Z_BUF_ERROR)
{
buffer_size *= 2;
out_size = buffer_size;
buffer.resize(buffer_size);
}
else if (ret == Z_STREAM_ERROR)
{
log_error("Your build is shipped with broken zlib. Please use the official build.");
return std::nullopt;
}
ret = compress(buffer.data(), &out_size, data, static_cast<uLong>(data_in_size));
} while (ret != Z_OK);
buffer.resize(out_size);
return buffer;
}
// Compress the source to gzip-compatible stream, write to dest.
// Mainly used for compressing the crashdumps
bool util_gzip_compress(FILE* source, FILE* dest)

1
src/openrct2/util/Util.h
View File

@ -53,7 +53,6 @@ bool str_is_null_or_empty(const char* str);
uint32_t util_rand();
std::optional<std::vector<uint8_t>> util_zlib_deflate(const uint8_t* data, size_t data_in_size);
bool util_gzip_compress(FILE* source, FILE* dest);
std::vector<uint8_t> Gzip(const void* data, const size_t dataLen);
std::vector<uint8_t> Ungzip(const void* data, const size_t dataLen);