Rename read_length to read_uint16, and add a read_uint8.

[fjl] / dehuff.c

diff --git a/dehuff.c b/dehuff.c
index 8fd4c2072fce46cbe792295fc977a3e7f53b2deb..af16b512a83c0f796fd24ff8a499e15fe3719817 100644 (file)
--- a/dehuff.c
+++ b/dehuff.c
@@ -8,7 +8,7 @@
 
 void read_huffman_tables(huffman_tables_t* dst, input_func_t* input_func, void* userdata)
 {
-       size_t len = read_length(input_func, userdata);
+       size_t len = read_uint16(input_func, userdata);
        assert(len > 2);
        len -= 2;
 
@@ -32,7 +32,7 @@ void read_huffman_tables(huffman_tables_t* dst, input_func_t* input_func, void*
                        exit(1);
                }
 
-               struct huffman_table* tbl = dst[table_class][table_dest];
+               struct huffman_table* tbl = &((*dst)[table_class][table_dest]);
                if (len < 16) {
                        fprintf(stderr, "Short read for num_codes\n");
                        exit(1);