X-Git-Url: https://git.sesse.net/?p=fjl;a=blobdiff_plain;f=dehuff.h;h=9243e101530018b346e80e2db8b64b96dee1db61;hp=a6a431a8139440a7052ce1dadd39b182ee5566b4;hb=8389f95d5750d6fcb202181005954829e64865b4;hpb=9069ae93f3e9e9b44f5f28968f508d09f0711737

diff --git a/dehuff.h b/dehuff.h
index a6a431a..9243e10 100644
--- a/dehuff.h
+++ b/dehuff.h
@@ -48,10 +48,10 @@ void read_huffman_tables(huffman_tables_t* dst, input_func_t* input_func, void*
 unsigned read_huffman_symbol_slow_path(const struct huffman_table* table,
                                        struct bit_source* source);
 
-static inline unsigned read_huffman_symbol(const struct huffman_table* table,
-                                           struct bit_source* source)
+static inline unsigned read_huffman_symbol_no_refill(
+	const struct huffman_table* table,
+	struct bit_source* source)
 {
-	possibly_refill(source, DEHUF_TABLE_BITS);
 	assert(source->bits_available >= DEHUF_TABLE_BITS);
 	unsigned lookup = peek_bits(source, DEHUF_TABLE_BITS);
 	int code = table->lookup_table_codes[lookup];
@@ -65,6 +65,13 @@ static inline unsigned read_huffman_symbol(const struct huffman_table* table,
 	return code;
 }
 
+static inline unsigned read_huffman_symbol(const struct huffman_table* table,
+                                           struct bit_source* source)
+{
+	possibly_refill(source, DEHUF_TABLE_BITS);
+	return read_huffman_symbol_no_refill(table, source);
+}
+
 // procedure EXTEND (figure F.12)
 
 // Fast lookup table for (1 << (bits - 1)).