diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-06 14:24:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-08-06 14:24:55 (GMT) |
| commit | 7a976ee74237ad916396ba95a84e6842d79c395c (patch) | |
| tree | 36b3eddd0d844fbd828959c1f3728e2ceb621286 /Utilities/cmliblzma/liblzma/lz/lz_encoder.h | |
| parent | 021b54cab8cf52a2ac93e80fbb30a98ed6d5e9f7 (diff) | |
| parent | 352b8fa70d18ff1664cd8b22f42cf980a976ae4d (diff) | |
| download | CMake-7a976ee74237ad916396ba95a84e6842d79c395c.zip CMake-7a976ee74237ad916396ba95a84e6842d79c395c.tar.gz CMake-7a976ee74237ad916396ba95a84e6842d79c395c.tar.bz2 | |
Merge branch 'upstream-liblzma' into update-liblzma
* upstream-liblzma:
liblzma 2018-04-29 (b5be61cc)
Diffstat (limited to 'Utilities/cmliblzma/liblzma/lz/lz_encoder.h')
| -rw-r--r-- | Utilities/cmliblzma/liblzma/lz/lz_encoder.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Utilities/cmliblzma/liblzma/lz/lz_encoder.h b/Utilities/cmliblzma/liblzma/lz/lz_encoder.h index 741c453..426dcd8 100644 --- a/Utilities/cmliblzma/liblzma/lz/lz_encoder.h +++ b/Utilities/cmliblzma/liblzma/lz/lz_encoder.h @@ -119,7 +119,7 @@ struct lzma_mf_s { lzma_action action; /// Number of elements in hash[] - uint32_t hash_size_sum; + uint32_t hash_count; /// Number of elements in son[] uint32_t sons_count; @@ -191,19 +191,18 @@ typedef struct { typedef struct { /// Data specific to the LZ-based encoder - lzma_coder *coder; + void *coder; /// Function to encode from *dict to out[] - lzma_ret (*code)(lzma_coder *restrict coder, + lzma_ret (*code)(void *coder, lzma_mf *restrict mf, uint8_t *restrict out, size_t *restrict out_pos, size_t out_size); /// Free allocated resources - void (*end)(lzma_coder *coder, lzma_allocator *allocator); + void (*end)(void *coder, const lzma_allocator *allocator); /// Update the options in the middle of the encoding. - lzma_ret (*options_update)(lzma_coder *coder, - const lzma_filter *filter); + lzma_ret (*options_update)(void *coder, const lzma_filter *filter); } lzma_lz_encoder; @@ -296,10 +295,10 @@ mf_read(lzma_mf *mf, uint8_t *out, size_t *out_pos, size_t out_size, extern lzma_ret lzma_lz_encoder_init( - lzma_next_coder *next, lzma_allocator *allocator, + lzma_next_coder *next, const lzma_allocator *allocator, const lzma_filter_info *filters, lzma_ret (*lz_init)(lzma_lz_encoder *lz, - lzma_allocator *allocator, const void *options, + const lzma_allocator *allocator, const void *options, lzma_lz_options *lz_options)); |