From 1f7c498bd985924e55b723ff4dea7cd9ef6228d4 Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Sat, 22 Jun 2024 23:05:01 +0200 Subject: [PATCH] fix compiler error in decomp --- include/Zlib/Compressor.h | 4 ++-- src/Compressor.cpp | 6 +++--- src/Network/VehicleData.cpp | 4 +--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/Zlib/Compressor.h b/include/Zlib/Compressor.h index a3c383f..4dcac5c 100644 --- a/include/Zlib/Compressor.h +++ b/include/Zlib/Compressor.h @@ -9,5 +9,5 @@ #include #include -std::vector Comp(std::span input); -std::vector DeComp(std::span input); +std::vector Comp(std::span input); +std::vector DeComp(std::span input); diff --git a/src/Compressor.cpp b/src/Compressor.cpp index c8bcf2e..806d1e4 100644 --- a/src/Compressor.cpp +++ b/src/Compressor.cpp @@ -15,14 +15,14 @@ #include #endif -std::vector Comp(std::span input) { +std::vector Comp(std::span input) { auto max_size = compressBound(input.size()); std::vector output(max_size); uLongf output_size = output.size(); int res = compress( reinterpret_cast(output.data()), &output_size, - reinterpret_cast(input.data()), + reinterpret_cast(input.data()), static_cast(input.size())); if (res != Z_OK) { error("zlib compress() failed: " + std::to_string(res)); @@ -33,7 +33,7 @@ std::vector Comp(std::span input) { return output; } -std::vector DeComp(std::span input) { +std::vector DeComp(std::span input) { std::vector output_buffer(std::min(input.size() * 5, 15 * 1024 * 1024)); uLongf output_size = output_buffer.size(); diff --git a/src/Network/VehicleData.cpp b/src/Network/VehicleData.cpp index c8a1b72..e28579a 100644 --- a/src/Network/VehicleData.cpp +++ b/src/Network/VehicleData.cpp @@ -14,7 +14,6 @@ #include "linuxfixes.h" #include #include -#include #include #include #include @@ -22,7 +21,6 @@ #include "Logger.h" #include -#include #include SOCKET UDPSock = -1; @@ -52,7 +50,7 @@ void SendLarge(std::string Data) { void UDPParser(std::string_view Packet) { if (Packet.substr(0, 4) == "ABG:") { auto substr = Packet.substr(4); - auto res = DeComp(std::span(substr.data(), substr.size())); + auto res = DeComp(std::span(substr.data(), substr.size())); Packet = std::string(res.data(), res.size()); } ServerParser(Packet);