From cc0c0e56d8269e91f23739b57faf67d5b5cc0794 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 3 Jan 2009 11:12:41 +0100 Subject: [PATCH] read_huffman_tables() takes in unstuffed data, not raw data. --- dehuff.c | 2 +- dehuff.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dehuff.c b/dehuff.c index a725469..9b296a7 100644 --- a/dehuff.c +++ b/dehuff.c @@ -35,7 +35,7 @@ uint16_t read_length(raw_input_func_t* input_func, void* userdata) return (buf[0] << 8) | buf[1]; } -void read_huffman_tables(huffman_tables_t* dst, raw_input_func_t* input_func, void* userdata) +void read_huffman_tables(huffman_tables_t* dst, input_func_t* input_func, void* userdata) { size_t len = read_length(input_func, userdata); assert(len > 2); diff --git a/dehuff.h b/dehuff.h index 6865dae..3d3d8c5 100644 --- a/dehuff.h +++ b/dehuff.h @@ -43,13 +43,11 @@ enum coefficient_class { typedef struct huffman_table huffman_tables_t[NUM_COEFF_CLASSES][4]; // Read Huffman tables from a stream, and compute the derived values. -void read_huffman_tables(huffman_tables_t* dst, raw_input_func_t* input_func, void* userdata); +void read_huffman_tables(huffman_tables_t* dst, input_func_t* input_func, void* userdata); unsigned read_huffman_symbol_slow_path(const struct huffman_table* table, struct bit_source* source); -#include - static inline unsigned read_huffman_symbol(const struct huffman_table* table, struct bit_source* source) { -- 2.39.2