From 1ee060ca0dfae7d0a1c830c7495f3125acf0ec7f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 15 Aug 2020 05:25:28 -0400 Subject: common/compression: Roll back std::span changes Seems like all compilers don't support std::span yet. --- src/common/zstd_compression.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/common/zstd_compression.cpp') diff --git a/src/common/zstd_compression.cpp b/src/common/zstd_compression.cpp index 770833ee7..5f45459da 100644 --- a/src/common/zstd_compression.cpp +++ b/src/common/zstd_compression.cpp @@ -9,14 +9,14 @@ namespace Common::Compression { -std::vector CompressDataZSTD(std::span source, s32 compression_level) { +std::vector CompressDataZSTD(const u8* source, std::size_t source_size, s32 compression_level) { compression_level = std::clamp(compression_level, 1, ZSTD_maxCLevel()); - const std::size_t max_compressed_size = ZSTD_compressBound(source.size()); + const std::size_t max_compressed_size = ZSTD_compressBound(source_size); std::vector compressed(max_compressed_size); - const std::size_t compressed_size = ZSTD_compress( - compressed.data(), compressed.size(), source.data(), source.size(), compression_level); + const std::size_t compressed_size = + ZSTD_compress(compressed.data(), compressed.size(), source, source_size, compression_level); if (ZSTD_isError(compressed_size)) { // Compression failed @@ -28,8 +28,8 @@ std::vector CompressDataZSTD(std::span source, s32 compression_lev return compressed; } -std::vector CompressDataZSTDDefault(std::span source) { - return CompressDataZSTD(source, ZSTD_CLEVEL_DEFAULT); +std::vector CompressDataZSTDDefault(const u8* source, std::size_t source_size) { + return CompressDataZSTD(source, source_size, ZSTD_CLEVEL_DEFAULT); } std::vector DecompressDataZSTD(const std::vector& compressed) { -- cgit v1.2.3