ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jclhuff.c: Fix innocuous UBSan left shift warning

Browse Source 
This applies the progressive Huffman encoder fixes from
aa769febf2 and
d65e768b2e to the new lossless mode
Huffman encoder.
This commit is contained in:
DRC
2022-11-14 16:20:46 -06:00
parent 8fc9356581
commit 99866007c6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jclhuff.c
View File

@@ -43,7 +43,7 @@
*/ */
typedef struct { typedef struct {
JLONG put_buffer; /* current bit-accumulation buffer */ size_t put_buffer; /* current bit-accumulation buffer */
int put_bits; /* # of bits now in it */ int put_bits; /* # of bits now in it */
} savable_state; } savable_state;
@@ -246,14 +246,14 @@ emit_bits(working_state *state, unsigned int code, int size)
/* Emit some bits; return TRUE if successful, FALSE if must suspend */ /* Emit some bits; return TRUE if successful, FALSE if must suspend */
{ {
/* This routine is heavily used, so it's worth coding tightly. */ /* This routine is heavily used, so it's worth coding tightly. */
register JLONG put_buffer = (JLONG)code; register size_t put_buffer = (size_t)code;
register int put_bits = state->cur.put_bits; register int put_bits = state->cur.put_bits;
/* if size is 0, caller used an invalid Huffman table entry */ /* if size is 0, caller used an invalid Huffman table entry */
if (size == 0) if (size == 0)
ERREXIT(state->cinfo, JERR_HUFF_MISSING_CODE); ERREXIT(state->cinfo, JERR_HUFF_MISSING_CODE);
put_buffer &= (((JLONG)1) << size) - 1; /* mask off any extra bits in code */ put_buffer &= (((size_t)1) << size) - 1; /* mask off any extra bits in code */
put_bits += size; /* new number of bits in buffer */ put_bits += size; /* new number of bits in buffer */