Rename input.h to bitsource.h (and friends).

[fjl] / dehuff.h

diff --git a/dehuff.h b/dehuff.h
index 6865dae0d7169bbe62b390e86c662d8c6439b13a..728c62315c5570c9b3fb6f1771368d219330a2a3 100644 (file)
--- a/dehuff.h
+++ b/dehuff.h
@@ -6,7 +6,7 @@
 #include <sys/types.h>
 
 #include "bytesource.h"
-#include "input.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.
@@ -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 <stdio.h>
-
 static inline unsigned read_huffman_symbol(const struct huffman_table* table,
                                            struct bit_source* source)
 {