summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Schinagl <oliver@schinagl.nl>2005-06-05 16:17:55 (GMT)
committerOliver Schinagl <oliver@schinagl.nl>2005-06-05 16:17:55 (GMT)
commiteec71174e3181d68be405e69ed05b7d16f0e47fe (patch)
tree39c05b18a26b22abbdd9bf7049b113c0fe112964
parent5e03cffd5f9e981a57ae55e1a85d85ecbfdb63c0 (diff)
download5kk53-eec71174e3181d68be405e69ed05b7d16f0e47fe.zip
5kk53-eec71174e3181d68be405e69ed05b7d16f0e47fe.tar.gz
5kk53-eec71174e3181d68be405e69ed05b7d16f0e47fe.tar.bz2
-rw-r--r--src/d_huffman.c463
1 files changed, 252 insertions, 211 deletions
diff --git a/src/d_huffman.c b/src/d_huffman.c
index 38962ac..fb9c9d3 100644
--- a/src/d_huffman.c
+++ b/src/d_huffman.c
@@ -8,6 +8,21 @@
#include "jpegint.h"
#include "d_huffman.h"
+#include <string.h>
+
+#define MEMZERO(target,size) memset((void *)(target), 0, (size_t)(size))
+#define MEMCOPY(dest,src,size) memcpy((void *)(dest), (const void *)(src), (size_t)(size))
+
+
+/*
+ * In ANSI C, and indeed any rational implementation, size_t is also the
+ * type returned by sizeof(). However, it seems there are some irrational
+ * implementations out there, in which sizeof() returns an int even though
+ * size_t is defined as long or unsigned long. To ensure consistent results
+ * we always use this SIZEOF() macro in place of using sizeof() directly.
+ */
+
+#define SIZEOF(object) ((size_t) sizeof(object))
/*
@@ -26,7 +41,18 @@ typedef struct {
* such a compiler and you change MAX_COMPS_IN_SCAN.
*/
+#ifndef NO_STRUCT_ASSIGN
#define ASSIGN_STATE(dest,src) ((dest) = (src))
+#else
+#if MAX_COMPS_IN_SCAN == 4
+#define ASSIGN_STATE(dest,src) \
+ ((dest).last_dc_val[0] = (src).last_dc_val[0], \
+ (dest).last_dc_val[1] = (src).last_dc_val[1], \
+ (dest).last_dc_val[2] = (src).last_dc_val[2], \
+ (dest).last_dc_val[3] = (src).last_dc_val[3])
+#endif
+#endif
+
typedef struct {
struct jpeg_entropy_decoder pub; /* public fields */
@@ -61,181 +87,64 @@ typedef huff_entropy_decoder * huff_entropy_ptr;
* Initialize for a Huffman-compressed scan.
*/
-static void start_pass_huff_decoder (j_decompress_ptr cinfo) {
+/*
+
+METHODDEF(void)
+start_pass_huff_decoder (j_decompress_ptr cinfo)
+{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
int ci, blkn, dctbl, actbl;
jpeg_component_info * compptr;
- /* Check that the scan parameters Ss, Se, Ah/Al are OK for sequential JPEG.
- * This ought to be an error condition, but we make it a warning because
- * there are some baseline files out there with all zeroes in these bytes.
- */
+ // Check that the scan parameters Ss, Se, Ah/Al are OK for sequential JPEG.
+ // This ought to be an error condition, but we make it a warning because
+ // there are some baseline files out there with all zeroes in these bytes.
+
if (cinfo->Ss != 0 || cinfo->Se != DCTSIZE2-1 ||
cinfo->Ah != 0 || cinfo->Al != 0)
- perror("Invalid SOS parameters for sequential JPEG");
- /*WARNMS(cinfo, JWRN_NOT_SEQUENTIAL);*/
+ WARNMS(cinfo, JWRN_NOT_SEQUENTIAL);
for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
compptr = cinfo->cur_comp_info[ci];
dctbl = compptr->dc_tbl_no;
actbl = compptr->ac_tbl_no;
- /* Compute derived values for Huffman tables */
- /* We may do this more than once for a table, but it's not expensive */
+
+ // Compute derived values for Huffman tables
+ // We may do this more than once for a table, but it's not expensive
jpeg_make_d_derived_tbl(cinfo, TRUE, dctbl,
& entropy->dc_derived_tbls[dctbl]);
jpeg_make_d_derived_tbl(cinfo, FALSE, actbl,
& entropy->ac_derived_tbls[actbl]);
- /* Initialize DC predictions to 0 */
+ // Initialize DC predictions to 0
entropy->saved.last_dc_val[ci] = 0;
}
- /* Precalculate decoding info for each block in an MCU of this scan */
+ // Precalculate decoding info for each block in an MCU of this scan
for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
ci = cinfo->MCU_membership[blkn];
compptr = cinfo->cur_comp_info[ci];
- /* Precalculate which table to use for each block */
+ // Precalculate which table to use for each block
entropy->dc_cur_tbls[blkn] = entropy->dc_derived_tbls[compptr->dc_tbl_no];
entropy->ac_cur_tbls[blkn] = entropy->ac_derived_tbls[compptr->ac_tbl_no];
- /* Decide whether we really care about the coefficient values */
+ // Decide whether we really care about the coefficient values
if (compptr->component_needed) {
entropy->dc_needed[blkn] = TRUE;
- /* we don't need the ACs if producing a 1/8th-size image */
+ // we don't need the ACs if producing a 1/8th-size image
entropy->ac_needed[blkn] = (compptr->DCT_scaled_size > 1);
} else {
entropy->dc_needed[blkn] = entropy->ac_needed[blkn] = FALSE;
}
}
- /* Initialize bitread state variables */
+ // Initialize bitread state variables
entropy->bitstate.bits_left = 0;
- entropy->bitstate.get_buffer = 0; /* unnecessary, but keeps Purify quiet */
+ entropy->bitstate.get_buffer = 0; // unnecessary, but keeps Purify quiet
entropy->pub.insufficient_data = FALSE;
- /* Initialize restart counter */
+ // Initialize restart counter
entropy->restarts_to_go = cinfo->restart_interval;
}
-
-
-/*
- * Out-of-line code for bit fetching (shared with jdphuff.c).
- * See jdhuff.h for info about usage.
- * Note: current values of get_buffer and bits_left are passed as parameters,
- * but are returned in the corresponding fields of the state struct.
- *
- * On most machines MIN_GET_BITS should be 25 to allow the full 32-bit width
- * of get_buffer to be used. (On machines with wider words, an even larger
- * buffer could be used.) However, on some machines 32-bit shifts are
- * quite slow and take time proportional to the number of places shifted.
- * (This is true with most PC compilers, for instance.) In this case it may
- * be a win to set MIN_GET_BITS to the minimum value of 15. This reduces the
- * average shift distance at the cost of more calls to jpeg_fill_bit_buffer.
- */
-
-#ifdef SLOW_SHIFT_32
-#define MIN_GET_BITS 15 /* minimum allowable value */
-#else
-#define MIN_GET_BITS (BIT_BUF_SIZE-7)
-#endif
-
-/* Load up the bit buffer to a depth of at least nbits */
-boolean jpeg_fill_bit_buffer(bitread_working_state *state, register bit_buf_type get_buffer, register int bits_left, int nbits) {
- /* Copy heavily used state fields into locals (hopefully registers) */
- register const JOCTET * next_input_byte = state->next_input_byte;
- register size_t bytes_in_buffer = state->bytes_in_buffer;
- j_decompress_ptr cinfo = state->cinfo;
-
- /* Attempt to load at least MIN_GET_BITS bits into get_buffer. */
- /* (It is assumed that no request will be for more than that many bits.) */
- /* We fail to do so only if we hit a marker or are forced to suspend. */
-
- if (cinfo->unread_marker == 0) { /* cannot advance past a marker */
- while (bits_left < MIN_GET_BITS) {
- register int c;
-
- /* Attempt to read a byte */
- if (bytes_in_buffer == 0) {
- if (! (*cinfo->src->fill_input_buffer) (cinfo)) {
- return FALSE;
- }
- next_input_byte = cinfo->src->next_input_byte;
- bytes_in_buffer = cinfo->src->bytes_in_buffer;
- }
- bytes_in_buffer--;
- c = GETJOCTET(*next_input_byte++);
-
- /* If it's 0xFF, check and discard stuffed zero byte */
- if (c == 0xFF) {
- /* Loop here to discard any padding FF's on terminating marker,
- * so that we can save a valid unread_marker value. NOTE: we will
- * accept multiple FF's followed by a 0 as meaning a single FF data
- * byte. This data pattern is not valid according to the standard.
- */
- do {
- if (bytes_in_buffer == 0) {
- if (! (*cinfo->src->fill_input_buffer) (cinfo)) {
- return FALSE;
- }
- next_input_byte = cinfo->src->next_input_byte;
- bytes_in_buffer = cinfo->src->bytes_in_buffer;
- }
- bytes_in_buffer--;
- c = GETJOCTET(*next_input_byte++);
- } while (c == 0xFF);
-
- if (c == 0) {
- /* Found FF/00, which represents an FF data byte */
- c = 0xFF;
- } else {
- /* Oops, it's actually a marker indicating end of compressed data.
- * Save the marker code for later use.
- * Fine point: it might appear that we should save the marker into
- * bitread working state, not straight into permanent state. But
- * once we have hit a marker, we cannot need to suspend within the
- * current MCU, because we will read no more bytes from the data
- * source. So it is OK to update permanent state right away.
- */
- cinfo->unread_marker = c;
- /* See if we need to insert some fake zero bits. */
- goto no_more_bytes;
- }
- }
-
- /* OK, load c into get_buffer */
- get_buffer = (get_buffer << 8) | c;
- bits_left += 8;
- } /* end while */
- } else {
- no_more_bytes:
- /* We get here if we've read the marker that terminates the compressed
- * data segment. There should be enough bits in the buffer register
- * to satisfy the request; if so, no problem.
- */
- if (nbits > bits_left) {
- /* Uh-oh. Report corrupted data to user and stuff zeroes into
- * the data stream, so that we can produce some kind of image.
- * We use a nonvolatile flag to ensure that only one warning message
- * appears per data segment.
- */
- if (!cinfo->entropy->insufficient_data) {
- perror("Corrupt JPEG data: premature end of data segment");
- /* WARNMS(cinfo, JWRN_HIT_MARKER); */
- cinfo->entropy->insufficient_data = TRUE;
- }
- /* Fill the buffer with zero bits */
- get_buffer <<= MIN_GET_BITS - bits_left;
- bits_left = MIN_GET_BITS;
- }
- }
-
- /* Unload the local registers */
- state->next_input_byte = next_input_byte;
- state->bytes_in_buffer = bytes_in_buffer;
- state->get_buffer = get_buffer;
- state->bits_left = bits_left;
-
- return TRUE;
-}
-
+*/
/*
* Compute the derived values for a Huffman table.
@@ -244,7 +153,10 @@ boolean jpeg_fill_bit_buffer(bitread_working_state *state, register bit_buf_type
* Note this is also used by jdphuff.c.
*/
-void jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno, d_derived_tbl ** pdtbl) {
+GLOBAL(void)
+jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno,
+ d_derived_tbl ** pdtbl)
+{
JHUFF_TBL *htbl;
d_derived_tbl *dtbl;
int p, i, l, si, numsymbols;
@@ -259,19 +171,17 @@ void jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno, d
/* Find the input Huffman table */
if (tblno < 0 || tblno >= NUM_HUFF_TBLS)
- perror("Huffman table 0x%%02x was not defined");
- exit(1);
- /*ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);*/
+ perror("JERR_NO_HUFF_TABLE");
htbl =
isDC ? cinfo->dc_huff_tbl_ptrs[tblno] : cinfo->ac_huff_tbl_ptrs[tblno];
if (htbl == NULL)
- perror("Huffman table 0x%%02x was not defined");
- exit(1);
- /*ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);*/
+ perror("JERR_NO_HUFF_TABLE");
/* Allocate a workspace if we haven't already done so. */
if (*pdtbl == NULL)
- *pdtbl = (d_derived_tbl *) malloc((size_t) sizeof(d_derived_tbl));
+ *pdtbl = (d_derived_tbl *)
+ (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+ SIZEOF(d_derived_tbl));
dtbl = *pdtbl;
dtbl->pub = htbl; /* fill in back link */
@@ -281,9 +191,7 @@ void jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno, d
for (l = 1; l <= 16; l++) {
i = (int) htbl->bits[l];
if (i < 0 || p + i > 256) /* protect against table overrun */
- perror("Bogus Huffman table definition");
- exit(0);
- /*ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);*/
+ perror("JERR_BAD_HUFF_TABLE");
while (i--)
huffsize[p++] = (char) l;
}
@@ -305,9 +213,7 @@ void jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno, d
* it must still fit in si bits, since no code is allowed to be all ones.
*/
if (((INT32) code) >= (((INT32) 1) << si))
- perror("Bogus Huffman table definition");
- exit(0);
- /*ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);*/
+ perror("JERR_BAD_HUFF_TABLE");
code <<= 1;
si++;
}
@@ -362,65 +268,190 @@ void jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, boolean isDC, int tblno, d
for (i = 0; i < numsymbols; i++) {
int sym = htbl->huffval[i];
if (sym < 0 || sym > 15)
- perror("Bogus Huffman table definition");
- exit(0);
- /*ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);*/
+ perror("JERR_BAD_HUFF_TABLE");
}
}
}
/*
+ * Out-of-line code for bit fetching (shared with jdphuff.c).
+ * See jdhuff.h for info about usage.
+ * Note: current values of get_buffer and bits_left are passed as parameters,
+ * but are returned in the corresponding fields of the state struct.
+ *
+ * On most machines MIN_GET_BITS should be 25 to allow the full 32-bit width
+ * of get_buffer to be used. (On machines with wider words, an even larger
+ * buffer could be used.) However, on some machines 32-bit shifts are
+ * quite slow and take time proportional to the number of places shifted.
+ * (This is true with most PC compilers, for instance.) In this case it may
+ * be a win to set MIN_GET_BITS to the minimum value of 15. This reduces the
+ * average shift distance at the cost of more calls to jpeg_fill_bit_buffer.
+ */
+
+#ifdef SLOW_SHIFT_32
+#define MIN_GET_BITS 15 /* minimum allowable value */
+#else
+#define MIN_GET_BITS (BIT_BUF_SIZE-7)
+#endif
+
+
+GLOBAL(boolean)
+jpeg_fill_bit_buffer (bitread_working_state * state,
+ register bit_buf_type get_buffer, register int bits_left,
+ int nbits)
+/* Load up the bit buffer to a depth of at least nbits */
+{
+ /* Copy heavily used state fields into locals (hopefully registers) */
+ register const JOCTET * next_input_byte = state->next_input_byte;
+ register size_t bytes_in_buffer = state->bytes_in_buffer;
+ j_decompress_ptr cinfo = state->cinfo;
+
+ /* Attempt to load at least MIN_GET_BITS bits into get_buffer. */
+ /* (It is assumed that no request will be for more than that many bits.) */
+ /* We fail to do so only if we hit a marker or are forced to suspend. */
+
+ if (cinfo->unread_marker == 0) { /* cannot advance past a marker */
+ while (bits_left < MIN_GET_BITS) {
+ register int c;
+
+ /* Attempt to read a byte */
+ if (bytes_in_buffer == 0) {
+ if (! (*cinfo->src->fill_input_buffer) (cinfo))
+ return FALSE;
+ next_input_byte = cinfo->src->next_input_byte;
+ bytes_in_buffer = cinfo->src->bytes_in_buffer;
+ }
+ bytes_in_buffer--;
+ c = GETJOCTET(*next_input_byte++);
+
+ /* If it's 0xFF, check and discard stuffed zero byte */
+ if (c == 0xFF) {
+ /* Loop here to discard any padding FF's on terminating marker,
+ * so that we can save a valid unread_marker value. NOTE: we will
+ * accept multiple FF's followed by a 0 as meaning a single FF data
+ * byte. This data pattern is not valid according to the standard.
+ */
+ do {
+ if (bytes_in_buffer == 0) {
+ if (! (*cinfo->src->fill_input_buffer) (cinfo))
+ return FALSE;
+ next_input_byte = cinfo->src->next_input_byte;
+ bytes_in_buffer = cinfo->src->bytes_in_buffer;
+ }
+ bytes_in_buffer--;
+ c = GETJOCTET(*next_input_byte++);
+ } while (c == 0xFF);
+
+ if (c == 0) {
+ /* Found FF/00, which represents an FF data byte */
+ c = 0xFF;
+ } else {
+ /* Oops, it's actually a marker indicating end of compressed data.
+ * Save the marker code for later use.
+ * Fine point: it might appear that we should save the marker into
+ * bitread working state, not straight into permanent state. But
+ * once we have hit a marker, we cannot need to suspend within the
+ * current MCU, because we will read no more bytes from the data
+ * source. So it is OK to update permanent state right away.
+ */
+ cinfo->unread_marker = c;
+ /* See if we need to insert some fake zero bits. */
+ goto no_more_bytes;
+ }
+ }
+
+ /* OK, load c into get_buffer */
+ get_buffer = (get_buffer << 8) | c;
+ bits_left += 8;
+ } /* end while */
+ } else {
+ no_more_bytes:
+ /* We get here if we've read the marker that terminates the compressed
+ * data segment. There should be enough bits in the buffer register
+ * to satisfy the request; if so, no problem.
+ */
+ if (nbits > bits_left) {
+ /* Uh-oh. Report corrupted data to user and stuff zeroes into
+ * the data stream, so that we can produce some kind of image.
+ * We use a nonvolatile flag to ensure that only one warning message
+ * appears per data segment.
+ */
+ if (! cinfo->entropy->insufficient_data) {
+ perror("WARNING JWRN_HIT_MARKER");
+ cinfo->entropy->insufficient_data = TRUE;
+ }
+ /* Fill the buffer with zero bits */
+ get_buffer <<= MIN_GET_BITS - bits_left;
+ bits_left = MIN_GET_BITS;
+ }
+ }
+
+ /* Unload the local registers */
+ state->next_input_byte = next_input_byte;
+ state->bytes_in_buffer = bytes_in_buffer;
+ state->get_buffer = get_buffer;
+ state->bits_left = bits_left;
+
+ return TRUE;
+}
+
+
+/*
* Out-of-line code for Huffman code decoding.
* See jdhuff.h for info about usage.
*/
-int jpeg_huff_decode(bitread_working_state *state, register bit_buf_type get_buffer, register int bits_left, d_derived_tbl *htbl, int min_bits) {
- register int l = min_bits;
- register INT32 code;
+GLOBAL(int)
+jpeg_huff_decode (bitread_working_state * state,
+ register bit_buf_type get_buffer, register int bits_left,
+ d_derived_tbl * htbl, int min_bits)
+{
+ register int l = min_bits;
+ register INT32 code;
- /* HUFF_DECODE has determined that the code is at least min_bits */
- /* bits long, so fetch that many bits in one swoop. */
+ /* HUFF_DECODE has determined that the code is at least min_bits */
+ /* bits long, so fetch that many bits in one swoop. */
- CHECK_BIT_BUFFER(*state, l, return -1);
- code = GET_BITS(l);
+ CHECK_BIT_BUFFER(*state, l, return -1);
+ code = GET_BITS(l);
- /* Collect the rest of the Huffman code one bit at a time. */
- /* This is per Figure F.16 in the JPEG spec. */
+ /* Collect the rest of the Huffman code one bit at a time. */
+ /* This is per Figure F.16 in the JPEG spec. */
- while (code > htbl->maxcode[l]) {
- code <<= 1;
- CHECK_BIT_BUFFER(*state, 1, return -1);
- code |= GET_BITS(1);
- l++;
- }
+ while (code > htbl->maxcode[l]) {
+ code <<= 1;
+ CHECK_BIT_BUFFER(*state, 1, return -1);
+ code |= GET_BITS(1);
+ l++;
+ }
- /* Unload the local registers */
- state->get_buffer = get_buffer;
- state->bits_left = bits_left;
+ /* Unload the local registers */
+ state->get_buffer = get_buffer;
+ state->bits_left = bits_left;
- /* With garbage input we may reach the sentinel value l = 17. */
+ /* With garbage input we may reach the sentinel value l = 17. */
- if (l > 16) {
- perror("Corrupt JPEG data: bad Huffman code");
-/* WARNMS(state->cinfo, JWRN_HUFF_BAD_CODE); */
- return 0; /* fake a zero as the safest result */
- }
+ if (l > 16) {
+ perror("WARNING JWRN_HUFF_BAD_CODE");
+ return 0; /* fake a zero as the safest result */
+ }
- return htbl->pub->huffval[ (int)(code + htbl->valoffset[l]) ];
+ return htbl->pub->huffval[ (int) (code + htbl->valoffset[l]) ];
}
+
/*
* Figure F.12: extend sign bit.
* On some machines, a shift and add will be faster than a table lookup.
*/
-/*#ifdef AVOID_TABLES
+#ifdef AVOID_TABLES
#define HUFF_EXTEND(x,s) ((x) < (1<<((s)-1)) ? (x) + (((-1)<<(s)) + 1) : (x))
#else
-*/
+
#define HUFF_EXTEND(x,s) ((x) < extend_test[s] ? (x) + extend_offset[s] : (x))
static const int extend_test[16] = /* entry n is 2**(n-1) */
@@ -433,7 +464,7 @@ static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
-/*#endif / * AVOID_TABLES */
+#endif /* AVOID_TABLES */
/*
@@ -441,18 +472,20 @@ static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
* Returns FALSE if must suspend.
*/
-static boolean process_restart (j_decompress_ptr cinfo) {
+LOCAL(boolean)
+process_restart (j_decompress_ptr cinfo)
+{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
int ci;
/* Throw away any unused bits remaining in bit buffer; */
/* include any full bytes in next_marker's count of discarded bytes */
-// cinfo->marker->discarded_bytes += entropy->bitstate.bits_left / 8;
- entropy->bitstate.bits_left = 0;
+ // cinfo->marker->discarded_bytes += entropy->bitstate.bits_left / 8; TODO
+ // entropy->bitstate.bits_left = 0;
/* Advance past the RSTn marker */
-// if (! (*cinfo->marker->read_restart_marker) (cinfo))
-// return FALSE;
+ //if (! (*cinfo->marker->read_restart_marker) (cinfo)) TODO:
+ // return FALSE;
/* Re-initialize DC predictions to 0 */
for (ci = 0; ci < cinfo->comps_in_scan; ci++)
@@ -466,8 +499,8 @@ static boolean process_restart (j_decompress_ptr cinfo) {
* segment as empty, and we can avoid producing bogus output pixels by
* leaving the flag set.
*/
- if (cinfo->unread_marker == 0)
- entropy->pub.insufficient_data = FALSE;
+ // if (cinfo->unread_marker == 0) TODO:
+ // entropy->pub.insufficient_data = FALSE;
return TRUE;
}
@@ -488,7 +521,9 @@ static boolean process_restart (j_decompress_ptr cinfo) {
* this module, since we'll just re-assign them on the next call.)
*/
-static boolean decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) {
+METHODDEF(boolean)
+decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
+{
huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
int blkn;
BITREAD_STATE_VARS;
@@ -599,29 +634,35 @@ static boolean decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) {
return TRUE;
}
+
/*
* Module initialization routine for Huffman entropy decoding.
*/
-
-void jinit_huff_decoder (j_decompress_ptr cinfo) {
- huff_entropy_ptr entropy;
- int i;
-
- entropy = (huff_entropy_ptr) malloc((size_t) sizeof(huff_entropy_decoder));
-
- cinfo->entropy = (struct jpeg_entropy_decoder *) entropy;
- entropy->pub.start_pass = start_pass_huff_decoder;
- entropy->pub.decode_mcu = decode_mcu;
-
- /* Mark tables unallocated */
- for (i = 0; i < NUM_HUFF_TBLS; i++) {
- entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
- }
+/*
+GLOBAL(void)
+jinit_huff_decoder (j_decompress_ptr cinfo)
+{
+ //huff_entropy_ptr entropy;
+ //int i;
+
+ // entropy = (huff_entropy_ptr)
+ // (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+// SIZEOF(huff_entropy_decoder));
+// cinfo->entropy = (struct jpeg_entropy_decoder *) entropy;
+ // entropy->pub.start_pass = start_pass_huff_decoder;
+// entropy->pub.decode_mcu = decode_mcu;
+
+ // Mark tables unallocated
+// for (i = 0; i < NUM_HUFF_TBLS; i++) {
+// entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
+// }
}
-int main(void) {
- jinit_huff_decoder(NULL);
-
+*/
- return 0;
+JBLOCKROW data[64];
+void Test_Huffman_Decode(void)
+{
+decode_mcu( NULL, data);
}
+