diff options
Diffstat (limited to 'src/lzw.c')
| -rw-r--r-- | src/lzw.c | 23 |
1 files changed, 9 insertions, 14 deletions
@@ -36,9 +36,9 @@ * Note that an individual LZW code can be split over up to three sub-blocks. */ struct lzw_read_ctx { - const uint8_t *restrict data; /**< Pointer to start of input data */ - uint32_t data_len; /**< Input data length */ - uint32_t data_sb_next; /**< Offset to sub-block size */ + const uint8_t *restrict data; /**< Pointer to start of input data */ + size_t data_len; /**< Input data length */ + size_t data_sb_next; /**< Offset to sub-block size */ const uint8_t *sb_data; /**< Pointer to current sub-block in data */ size_t sb_bit; /**< Current bit offset in sub-block */ @@ -96,7 +96,6 @@ struct lzw_ctx { uint8_t stack_base[LZW_TABLE_ENTRY_MAX]; }; - /* Exported function, documented in lzw.h */ lzw_result lzw_context_create(struct lzw_ctx **ctx) { @@ -109,14 +108,12 @@ lzw_result lzw_context_create(struct lzw_ctx **ctx) return LZW_OK; } - /* Exported function, documented in lzw.h */ void lzw_context_destroy(struct lzw_ctx *ctx) { free(ctx); } - /** * Advance the context to the next sub-block in the input data. * @@ -125,8 +122,8 @@ void lzw_context_destroy(struct lzw_ctx *ctx) */ static lzw_result lzw__block_advance(struct lzw_read_ctx *restrict ctx) { - uint32_t block_size; - uint32_t next_block_pos = ctx->data_sb_next; + size_t block_size; + size_t next_block_pos = ctx->data_sb_next; const uint8_t *data_next = ctx->data + next_block_pos; if (next_block_pos >= ctx->data_len) { @@ -153,7 +150,6 @@ static lzw_result lzw__block_advance(struct lzw_read_ctx *restrict ctx) return LZW_OK; } - /** * Get the next LZW code of given size from the raw input data. * @@ -223,7 +219,6 @@ static inline lzw_result lzw__read_code( return LZW_OK; } - /** * Handle clear code. * @@ -265,8 +260,8 @@ lzw_result lzw_decode_init( struct lzw_ctx *ctx, uint8_t minimum_code_size, const uint8_t *input_data, - uint32_t input_length, - uint32_t input_pos) + size_t input_length, + size_t input_pos) { struct lzw_table_entry *table = ctx->table; lzw_result res; @@ -327,8 +322,8 @@ lzw_result lzw_decode_init_map( uint32_t transparency_idx, const uint32_t *colour_table, const uint8_t *input_data, - uint32_t input_length, - uint32_t input_pos) + size_t input_length, + size_t input_pos) { lzw_result res; |