Module: Mesa Branch: master Commit: 9cf0aac13097807dca468735fe84eba111b0fb9d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9cf0aac13097807dca468735fe84eba111b0fb9d
Author: Timothy Arceri <[email protected]> Date: Mon Mar 15 16:06:08 2021 +1100 util/compress: make compression function inputs const Reviewed-By: Mike Blumenkrantz <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9443> --- src/util/compress.c | 9 +++++++-- src/util/compress.h | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/util/compress.c b/src/util/compress.c index a3fe21345a1..8b86b9d9305 100644 --- a/src/util/compress.c +++ b/src/util/compress.c @@ -23,6 +23,11 @@ #include <assert.h> +/* Ensure that zlib uses 'const' in 'z_const' declarations. */ +#ifndef ZLIB_CONST +#define ZLIB_CONST +#endif + #include "zlib.h" #ifdef HAVE_ZSTD @@ -59,7 +64,7 @@ util_compress_max_compressed_len(size_t in_data_size) /* Compress data and return the size of the compressed data */ size_t -util_compress_deflate(uint8_t *in_data, size_t in_data_size, +util_compress_deflate(const uint8_t *in_data, size_t in_data_size, uint8_t *out_data, size_t out_buff_size) { #ifdef HAVE_ZSTD @@ -107,7 +112,7 @@ util_compress_deflate(uint8_t *in_data, size_t in_data_size, * Decompresses data, returns true if successful. */ bool -util_compress_inflate(uint8_t *in_data, size_t in_data_size, +util_compress_inflate(const uint8_t *in_data, size_t in_data_size, uint8_t *out_data, size_t out_data_size) { #ifdef HAVE_ZSTD diff --git a/src/util/compress.h b/src/util/compress.h index d93923379b8..1dcd4a8f982 100644 --- a/src/util/compress.h +++ b/src/util/compress.h @@ -28,9 +28,9 @@ size_t util_compress_max_compressed_len(size_t in_data_size); bool -util_compress_inflate(uint8_t *in_data, size_t in_data_size, +util_compress_inflate(const uint8_t *in_data, size_t in_data_size, uint8_t *out_data, size_t out_data_size); size_t -util_compress_deflate(uint8_t *in_data, size_t in_data_size, +util_compress_deflate(const uint8_t *in_data, size_t in_data_size, uint8_t *out_data, size_t out_buff_size); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
