|
|
@ -1023,7 +1023,7 @@ static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile |
|
|
|
|
|
|
|
|
|
|
|
/* TIER-1 routines */ |
|
|
|
/* TIER-1 routines */ |
|
|
|
static void decode_sigpass(Jpeg2000T1Context *t1, int width, int height, |
|
|
|
static void decode_sigpass(Jpeg2000T1Context *t1, int width, int height, |
|
|
|
int bpno, int bandno, int bpass_csty_symbol, |
|
|
|
int bpno, int bandno, |
|
|
|
int vert_causal_ctx_csty_symbol) |
|
|
|
int vert_causal_ctx_csty_symbol) |
|
|
|
{ |
|
|
|
{ |
|
|
|
int mask = 3 << (bpno - 1), y0, x, y; |
|
|
|
int mask = 3 << (bpno - 1), y0, x, y; |
|
|
@ -1143,7 +1143,6 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, |
|
|
|
{ |
|
|
|
{ |
|
|
|
int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1, y; |
|
|
|
int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1, y; |
|
|
|
int pass_cnt = 0; |
|
|
|
int pass_cnt = 0; |
|
|
|
int bpass_csty_symbol = codsty->cblk_style & JPEG2000_CBLK_BYPASS; |
|
|
|
|
|
|
|
int vert_causal_ctx_csty_symbol = codsty->cblk_style & JPEG2000_CBLK_VSC; |
|
|
|
int vert_causal_ctx_csty_symbol = codsty->cblk_style & JPEG2000_CBLK_VSC; |
|
|
|
int term_cnt = 0; |
|
|
|
int term_cnt = 0; |
|
|
|
int coder_type; |
|
|
|
int coder_type; |
|
|
@ -1169,7 +1168,6 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, |
|
|
|
switch(pass_t) { |
|
|
|
switch(pass_t) { |
|
|
|
case 0: |
|
|
|
case 0: |
|
|
|
decode_sigpass(t1, width, height, bpno + 1, bandpos, |
|
|
|
decode_sigpass(t1, width, height, bpno + 1, bandpos, |
|
|
|
bpass_csty_symbol && (pass_cnt >= 3*3), |
|
|
|
|
|
|
|
vert_causal_ctx_csty_symbol); |
|
|
|
vert_causal_ctx_csty_symbol); |
|
|
|
break; |
|
|
|
break; |
|
|
|
case 1: |
|
|
|
case 1: |
|
|
|