From d81618e5fec7fa649ec8638ec8b3243783f7909f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tur=C3=A1nszki=20J=C3=A1nos?= Date: Sun, 12 Jan 2025 19:48:03 +0100 Subject: [PATCH] fix in compress/decompress and remove unused function --- WickedEngine/wiHelper.cpp | 18 +++++++++--------- WickedEngine/wiVersion.cpp | 2 +- WickedEngine/wiVersion.h | 1 - 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/WickedEngine/wiHelper.cpp b/WickedEngine/wiHelper.cpp index 8e39ee640..465f2d2de 100644 --- a/WickedEngine/wiHelper.cpp +++ b/WickedEngine/wiHelper.cpp @@ -1571,19 +1571,19 @@ namespace wi::helper { dst_data.resize(ZSTD_compressBound(src_size)); size_t res = ZSTD_compress(dst_data.data(), dst_data.size(), src_data, src_size, level); - if (res >= 0) { - dst_data.resize(res); - } - return res >= 0; + if (ZSTD_isError(res)) + return false; + dst_data.resize(res); + return true; } bool Decompress(const uint8_t* src_data, size_t src_size, wi::vector& dst_data) { - size_t size = ZSTD_getFrameContentSize(src_data, src_size); - if (size < 0) { + size_t res = ZSTD_getFrameContentSize(src_data, src_size); + if (ZSTD_isError(res)) return false; - } - dst_data.resize(size); - return ZSTD_decompress(dst_data.data(), dst_data.size(), src_data, src_size) >= 0; + dst_data.resize(res); + res = ZSTD_decompress(dst_data.data(), dst_data.size(), src_data, src_size); + return ZSTD_isError(res) == 0; } } diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 2d47ddc2a..21f79d6d1 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wi::version // minor features, major updates, breaking compatibility changes const int minor = 71; // minor bug fixes, alterations, refactors, updates - const int revision = 652; + const int revision = 653; const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision); diff --git a/WickedEngine/wiVersion.h b/WickedEngine/wiVersion.h index 5e251151c..bfe21bac6 100644 --- a/WickedEngine/wiVersion.h +++ b/WickedEngine/wiVersion.h @@ -3,7 +3,6 @@ namespace wi::version { - long GetVersion(); // major features int GetMajor(); // minor features, major bug fixes