diff options
Diffstat (limited to 'dec')
| -rw-r--r-- | dec/state.c | 15 | ||||
| -rw-r--r-- | dec/state.h | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/dec/state.c b/dec/state.c index bb37c77..27f4129 100644 --- a/dec/state.c +++ b/dec/state.c @@ -137,10 +137,9 @@ void BrotliDecoderStateCleanupAfterMetablock(BrotliDecoderState* s) { BROTLI_FREE(s, s->context_modes); BROTLI_FREE(s, s->context_map); BROTLI_FREE(s, s->dist_context_map); - - BrotliDecoderHuffmanTreeGroupRelease(s, &s->literal_hgroup); - BrotliDecoderHuffmanTreeGroupRelease(s, &s->insert_copy_hgroup); - BrotliDecoderHuffmanTreeGroupRelease(s, &s->distance_hgroup); + BROTLI_FREE(s, s->literal_hgroup.htrees); + BROTLI_FREE(s, s->insert_copy_hgroup.htrees); + BROTLI_FREE(s, s->distance_hgroup.htrees); } void BrotliDecoderStateCleanup(BrotliDecoderState* s) { @@ -160,17 +159,11 @@ BROTLI_BOOL BrotliDecoderHuffmanTreeGroupInit(BrotliDecoderState* s, HuffmanCode** p = (HuffmanCode**)BROTLI_ALLOC(s, code_size + htree_size); group->alphabet_size = (uint16_t)alphabet_size; group->num_htrees = (uint16_t)ntrees; - group->htrees = (HuffmanCode**)p; + group->htrees = p; group->codes = (HuffmanCode*)(&p[ntrees]); return !!p; } -void BrotliDecoderHuffmanTreeGroupRelease( - BrotliDecoderState* s, HuffmanTreeGroup* group) { - BROTLI_FREE(s, group->htrees); - group->htrees = NULL; -} - #if defined(__cplusplus) || defined(c_plusplus) } /* extern "C" */ #endif diff --git a/dec/state.h b/dec/state.h index ace6002..5946124 100644 --- a/dec/state.h +++ b/dec/state.h @@ -242,8 +242,6 @@ BROTLI_INTERNAL void BrotliDecoderStateCleanupAfterMetablock( BROTLI_INTERNAL BROTLI_BOOL BrotliDecoderHuffmanTreeGroupInit( BrotliDecoderState* s, HuffmanTreeGroup* group, uint32_t alphabet_size, uint32_t ntrees); -BROTLI_INTERNAL void BrotliDecoderHuffmanTreeGroupRelease( - BrotliDecoderState* s, HuffmanTreeGroup* group); #if defined(__cplusplus) || defined(c_plusplus) } /* extern "C" */ |