On Fri, Jun 28, 2013 at 12:25:26PM +0200, Nicolas Bertrand wrote:
> From: Michael Niedermayer <[email protected]>
s/of//
> --- a/libavcodec/jpeg2kdec.c
> +++ b/libavcodec/jpeg2kdec.c
> @@ -828,32 +828,33 @@ static int jpeg2k_decode_packets(Jpeg2KDecoderContext
> *s, Jpeg2KTile *tile)
>
> for (y0 = 0; y0 < height; y0 += 4)
> for (x = 0; x < width; x++)
> - for (y = y0; y < height && y < y0 + 4; y++)
> - if ((t1->flags[y + 1][x + 1] & JPEG2K_T1_SIG_NB)
> - && !(t1->flags[y + 1][x + 1] & (JPEG2K_T1_SIG |
> JPEG2K_T1_VIS))) {
> - if (ff_mqc_decode(&t1->mqc,
> - t1->mqc.cx_states +
> - ff_jpeg2k_getsigctxno(t1->flags[y +
> 1][x + 1],
> - bandno))) {
> - int xorbit, ctxno =
> ff_jpeg2k_getsgnctxno(t1->flags[y + 1][x + 1],
> - &xorbit);
> -
> - t1->data[y][x] =
> - (ff_mqc_decode(&t1->mqc,
> - t1->mqc.cx_states + ctxno) ^
> xorbit)
> - ? -mask : mask;
> + for (y = y0; y < height && y < y0 + 4; y++) {
> + if ((t1->flags[y+1][x+1] & JPEG2K_T1_SIG_NB)
> + && !(t1->flags[y+1][x+1] & (JPEG2K_T1_SIG | JPEG2K_T1_VIS)))
> {
indentation, && at the end of the line
> + int flags_mask = -1;
> + if (vert_causal_ctx_csty_symbol && y == y0 + 3)
> + flags_mask &= ~(JPEG2K_T1_SIG_S | JPEG2K_T1_SIG_SW |
> JPEG2K_T1_SIG_SE);
> + if (ff_mqc_decode(&t1->mqc, t1->mqc.cx_states +
> ff_jpeg2k_getsigctxno(t1->flags[y+1][x+1] & flags_mask, bandno))) {
> + int xorbit, ctxno =
> ff_jpeg2k_getsgnctxno(t1->flags[y+1][x+1], &xorbit);
> + if (bpass_csty_symbol)
> + t1->data[y][x] = ff_mqc_decode(&t1->mqc,
> t1->mqc.cx_states + ctxno) ? -mask : mask;
> + else
> + t1->data[y][x] = (ff_mqc_decode(&t1->mqc,
> t1->mqc.cx_states + ctxno) ^ xorbit) ?
> + -mask : mask;
Ugh, all spaces around operators are suddenly gone...
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
