diff options
| author | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2007-08-21 12:30:08 +0000 |
|---|---|---|
| committer | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2007-08-21 12:30:08 +0000 |
| commit | d4d23c7eb56203d620b888fc67316e47ca9b20ca (patch) | |
| tree | 5e1111f164de5c01b038e982e571ae1f8e485032 /libopenjpeg/t1.c | |
| parent | adca52578d6ba5284b7df39ebdf9ed61a5e31d74 (diff) | |
Reworks of t1_updateflags to get rid of the shift operation. mqc_setcurctx moved to the header to allow it to be inlined into the t1.
Diffstat (limited to 'libopenjpeg/t1.c')
| -rw-r--r-- | libopenjpeg/t1.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/libopenjpeg/t1.c b/libopenjpeg/t1.c index 724ec04d..c815cff1 100644 --- a/libopenjpeg/t1.c +++ b/libopenjpeg/t1.c @@ -261,21 +261,22 @@ static void t1_updateflags(flag_t *flagsp, int s, int stride) { flag_t *sp = flagsp + stride; static const flag_t mod[] = { - T1_SIG_S, T1_SIG_N, T1_SIG_E, T1_SIG_W, - T1_SIG_S | T1_SGN_S, T1_SIG_N | T1_SGN_N, T1_SIG_E | T1_SGN_E, T1_SIG_W | T1_SGN_W + T1_SIG_S, T1_SIG_S|T1_SGN_S, + T1_SIG_E, T1_SIG_E|T1_SGN_E, + T1_SIG_W, T1_SIG_W|T1_SGN_W, + T1_SIG_N, T1_SIG_N|T1_SGN_N }; - s <<= 2; - np[-1] |= T1_SIG_SE; np[0] |= mod[s]; np[1] |= T1_SIG_SW; flagsp[-1] |= mod[s+2]; - flagsp[1] |= mod[s+3]; + flagsp[0] |= T1_SIG; + flagsp[1] |= mod[s+4]; sp[-1] |= T1_SIG_NE; - sp[0] |= mod[s+1]; + sp[0] |= mod[s+6]; sp[1] |= T1_SIG_NW; } @@ -315,7 +316,6 @@ static void t1_enc_sigpass_step( mqc_encode(mqc, v ^ t1_getspb(flag)); } t1_updateflags(flagsp, v, t1->flags_stride); - *flagsp |= T1_SIG; } *flagsp |= T1_VISIT; } @@ -342,7 +342,6 @@ static void t1_dec_sigpass_step( v = raw_decode(raw); /* ESSAI */ *datap = v ? -oneplushalf : oneplushalf; t1_updateflags(flagsp, v, t1->flags_stride); - *flagsp |= T1_SIG; } } else { mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient)); @@ -351,7 +350,6 @@ static void t1_dec_sigpass_step( v = mqc_decode(mqc) ^ t1_getspb(flag); *datap = v ? -oneplushalf : oneplushalf; t1_updateflags(flagsp, v, t1->flags_stride); - *flagsp |= T1_SIG; } } *flagsp |= T1_VISIT; @@ -560,7 +558,6 @@ LABEL_PARTIAL: v = *datap < 0 ? 1 : 0; mqc_encode(mqc, v ^ t1_getspb(flag)); t1_updateflags(flagsp, v, t1->flags_stride); - *flagsp |= T1_SIG; } } *flagsp &= ~T1_VISIT; @@ -591,7 +588,6 @@ LABEL_PARTIAL: v = mqc_decode(mqc) ^ t1_getspb(flag); *datap = v ? -oneplushalf : oneplushalf; t1_updateflags(flagsp, v, t1->flags_stride); - *flagsp |= T1_SIG; } } *flagsp &= ~T1_VISIT; @@ -777,7 +773,7 @@ static bool allocate_buffers( memset(t1->data,0,datasize * sizeof(int)); t1->flags_stride=w+2; - flagssize = t1->flags_stride * (h+2); + flagssize=t1->flags_stride * (h+2); if(flagssize > t1->flagssize){ opj_aligned_free(t1->flags); |