read_huffman_tables() takes in unstuffed data, not raw data.

[fjl] / input.c

diff --git a/input.c b/input.c
index a36d83fd969f0acf7d543a22fbe2689539bb3d49..6c4630f075a4fee47751a149752ac415d10f7d6d 100644 (file)
--- a/input.c
+++ b/input.c
@@ -1,9 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <string.h>
 
 #include "input.h"
 
+#define MARKER_CHAR 0xff
+#define STUFF_MARKER 0x00
+
 void init_bit_source(struct bit_source* source, input_func_t* input_func, void* userdata)
 {
        memset(source, 0, sizeof(*source));
@@ -24,7 +28,7 @@ void possibly_refill_slow_path(struct bit_source* source, unsigned num_bits)
                        (*source->input_func)(source->userdata,
                                              source->bytes + source->bytes_available,
                                              bytes_to_read);
-               assert(bytes_read <= bytes_to_read);
+               assert(bytes_read <= (ssize_t)bytes_to_read);
                assert(bytes_read >= (ssize_t)-1);
 
                // TODO: We need better error handling here. setjmp()/longjmp()