35 lines
1.9 KiB
Diff
35 lines
1.9 KiB
Diff
|
src/lib/OpenEXRCore/internal_zip.c: In function ‘apply_zip_impl’:
|
|||
|
|
src/lib/OpenEXRCore/internal_zip.c:365:21: error: passing argument 2 of ‘compress2’ from incompatible pointer type [-Wincompatible-pointer-types]
|
|||
|
|
/usr/include/zlib.h:1229:69: note: expected ‘long unsigned int *’ but argument is of type ‘size_t *’ {aka ‘unsigned int *’}
|
|||
|
|
|
|||
|
|
src/lib/OpenEXRCore/internal_dwa_compressor.h: In function ‘exr_compress_buffer’:
|
|||
|
|
src/lib/OpenEXRCore/internal_dwa_compressor.h:57:21: error: passing argument 2 of ‘compress2’ from incompatible pointer type [-Wincompatible-pointer-types]
|
|||
|
|
/usr/include/zlib.h:1229:69: note: expected ‘long unsigned int *’ but argument is of type ‘size_t *’ {aka ‘unsigned int *’}
|
|||
|
|
|
|||
|
|
diff --git a/src/lib/OpenEXRCore/internal_dwa_compressor.h b/src/lib/OpenEXRCore/internal_dwa_compressor.h
|
|||
|
|
index e1d55336..0ee98d63 100644
|
|||
|
|
--- a/src/lib/OpenEXRCore/internal_dwa_compressor.h
|
|||
|
|
+++ b/src/lib/OpenEXRCore/internal_dwa_compressor.h
|
|||
|
|
@@ -54,7 +54,7 @@ static exr_result_t exr_compress_buffer (
|
|||
|
|
compbufsz = out_bytes_avail;
|
|||
|
|
if (Z_OK != compress2 (
|
|||
|
|
(Bytef*) out,
|
|||
|
|
- &compbufsz,
|
|||
|
|
+ (uLongf *) &compbufsz,
|
|||
|
|
(const Bytef*) in,
|
|||
|
|
(uLong) in_bytes,
|
|||
|
|
level))
|
|||
|
|
diff --git a/src/lib/OpenEXRCore/internal_zip.c b/src/lib/OpenEXRCore/internal_zip.c
|
|||
|
|
index f3980aee..820fd673 100644
|
|||
|
|
--- a/src/lib/OpenEXRCore/internal_zip.c
|
|||
|
|
+++ b/src/lib/OpenEXRCore/internal_zip.c
|
|||
|
|
@@ -362,7 +362,7 @@ apply_zip_impl (exr_encode_pipeline_t* encode)
|
|||
|
|
compbufsz = encode->compressed_alloc_size;
|
|||
|
|
if (Z_OK != compress2 (
|
|||
|
|
(Bytef*) encode->compressed_buffer,
|
|||
|
|
- &compbufsz,
|
|||
|
|
+ (uLongf *) &compbufsz,
|
|||
|
|
(const Bytef*) encode->scratch_buffer_1,
|
|||
|
|
(uLong) encode->packed_bytes,
|
|||
|
|
level))
|