Fix a bug in the fast Huffman decoder.

[fjl] / dehuff.h

diff --git a/dehuff.h b/dehuff.h
index d93e7931ee17f081e734e7ff5397dd2f973f200d..728c62315c5570c9b3fb6f1771368d219330a2a3 100644 (file)
--- a/dehuff.h
+++ b/dehuff.h
@@ -5,7 +5,8 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#include "input.h"
+#include "bytesource.h"
+#include "bitsource.h"
 
 // About 99% of all Huffman codes are <= 8 bits long (see codelen.txt),
 // and it's what libjpeg uses. Thus, it seems like a reasonable size.
@@ -13,11 +14,6 @@
 #define DEHUF_TABLE_SIZE (1 << DEHUF_TABLE_BITS)
 static const int DEHUF_SLOW_PATH = -1;
 
-// A function to read bytes from some input source. The bytes should be
-// already unstuffed (and thus without markers).
-// A return value of -1 indicates error, a return value of 0 indicates EOF.
-typedef ssize_t (raw_input_func_t)(void*, uint8_t*, size_t);
-
 struct huffman_table {
        unsigned num_codes[17];     // BITS
        unsigned char codes[256];   // HUFFVAL
@@ -47,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 <stdio.h>
-
 static inline unsigned read_huffman_symbol(const struct huffman_table* table,
                                            struct bit_source* source)
 {