unstuff_test: $(UNSTUFF_TEST_OBJS)
$(CC) $(LDFLAGS) -o $@ $(UNSTUFF_TEST_OBJS)
-INPUT_TEST_OBJS=input.o input_test.o
-input_test: $(INPUT_TEST_OBJS)
- $(CC) $(LDFLAGS) -o $@ $(INPUT_TEST_OBJS)
+BITSOURCE_TEST_OBJS=bitsource.o bitsource_test.o
+bitsource_test: $(BITSOURCE_TEST_OBJS)
+ $(CC) $(LDFLAGS) -o $@ $(BITSOURCE_TEST_OBJS)
-DEHUFF_TEST_OBJS=dehuff.o input.o dehuff_test.o
+DEHUFF_TEST_OBJS=dehuff.o bitsource.o dehuff_test.o
dehuff_test: $(DEHUFF_TEST_OBJS)
$(CC) $(LDFLAGS) -o $@ $(DEHUFF_TEST_OBJS)
bytesource_test: $(BYTESOURCE_TEST_OBJS)
$(CC) $(LDFLAGS) -o $@ $(BYTESOURCE_TEST_OBJS)
-tests: unstuff_test input_test dehuff_test bytesource_test
+tests: unstuff_test bitsource_test dehuff_test bytesource_test
clean:
$(RM) $(UNSTUFF_TEST_OBJS) unstuff_test
- $(RM) $(INPUT_TEST_OBJS) input_test
+ $(RM) $(BITSOURCE_TEST_OBJS) bitsource_test
$(RM) $(DEHUFF_TEST_OBJS) dehuff_test
$(RM) $(DEHUFF_TEST_OBJS) bytesource_test
test: tests
./unstuff_test
- ./input_test
+ ./bitsource_test
./dehuff_test
./bytesource_test
-#ifndef _INPUT_H
-#define _INPUT_H 1
+#ifndef _BITSOURCE_H
+#define _BITSOURCE_H 1
#include <assert.h>
#include <stddef.h>
return (source->bits >> (BITRESERVOIR_SIZE - num_bits));
}
-#endif /* !defined(_INPUT_H) */
+#endif /* !defined(_BITSOURCE_H) */
#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.