I have removed all the cinfo referances and it is almost usable see Test_Huffman_Decoder()

It still is not tested Gives currently

WARNING JWRN_HUFF_BAD_CODE: No error
WARNING JWRN_HUFF_BAD_CODE: No error
while decoding encoded data.

Could still be a bug in the encoder

1 files changed, 3 insertions, 7 deletions

diff --git a/include/d_huffman.h b/include/d_huffman.h
index ae19b6c..834a504 100644
--- a/include/d_huffman.h
+++ b/include/d_huffman.h
@@ -45,11 +45,6 @@ typedef struct {
   UINT8 look_sym[1<<HUFF_LOOKAHEAD]; /* symbol, or unused */
 } d_derived_tbl;
 
-/* Expand a Huffman table definition into the derived format */
-EXTERN(void) jpeg_make_d_derived_tbl
-	JPP((j_decompress_ptr cinfo, boolean isDC, int tblno,
-	     d_derived_tbl ** pdtbl));
-
 
 /*
  * Fetching the next N bits from the input stream is a time-critical operation
@@ -95,15 +90,16 @@ typedef struct {		/* Bitreading working state within an MCU */
   bit_buf_type get_buffer;	/* current bit-extraction buffer */
   int bits_left;		/* # of unused bits in it */
   /* Pointer needed by jpeg_fill_bit_buffer. */
-  j_decompress_ptr cinfo;	/* back link to decompress master record */
+//  j_decompress_ptr cinfo;	/* back link to decompress master record */
 } bitread_working_state;
 
 /* Macros to declare and load/save bitread local variables. */
+/*
 #define BITREAD_STATE_VARS  \
 	register bit_buf_type get_buffer;  \
 	register int bits_left;  \
 	bitread_working_state br_state
-
+*/
 #define BITREAD_LOAD_STATE(cinfop,permstate)  \
 	br_state.cinfo = cinfop; \
 	br_state.next_input_byte = cinfop->src->next_input_byte; \