[Spice-devel] [spice-common v2 10/13] quic: Remove unused argument in uncompress_row{0, }
Frediano Ziglio
fziglio at redhat.com
Thu Aug 3 08:09:43 UTC 2017
>
> 'correlation_row' is always set to channel->colleration_row, and we
> already pass 'channel' as an argument.
>
> Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
This patch does not compile
Frediano
> ---
> common/quic_tmpl.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/common/quic_tmpl.c b/common/quic_tmpl.c
> index e7b82b7..cd6d1f1 100644
> --- a/common/quic_tmpl.c
> +++ b/common/quic_tmpl.c
> @@ -323,7 +323,6 @@ static void FNAME(compress_row)(Encoder *encoder, Channel
> *channel,
> decode_eatbits(encoder, codewordlen);
>
> static void FNAME(uncompress_row0_seg)(Encoder *encoder, Channel *channel,
> int i,
> - BYTE * const correlate_row,
> PIXEL * const cur_row,
> const int end,
> const unsigned int waitmask,
> @@ -382,12 +381,11 @@ static void FNAME(uncompress_row0)(Encoder *encoder,
> Channel *channel,
> CommonState *state = &channel->state;
> const unsigned int bpc = BPC;
> const unsigned int bpc_mask = BPC_MASK;
> - BYTE * const correlate_row = channel->correlate_row;
> unsigned int pos = 0;
>
> while ((DEFwmimax > (int)state->wmidx) && (state->wmileft <= width)) {
> if (state->wmileft) {
> - FNAME(uncompress_row0_seg)(encoder, channel, pos, correlate_row,
> cur_row,
> + FNAME(uncompress_row0_seg)(encoder, channel, pos, cur_row,
> pos + state->wmileft,
> bppmask[state->wmidx],
> bpc, bpc_mask);
> pos += state->wmileft;
> @@ -400,7 +398,7 @@ static void FNAME(uncompress_row0)(Encoder *encoder,
> Channel *channel,
> }
>
> if (width) {
> - FNAME(uncompress_row0_seg)(encoder, channel, pos, correlate_row,
> cur_row, pos + width,
> + FNAME(uncompress_row0_seg)(encoder, channel, pos, cur_row, pos +
> width,
> bppmask[state->wmidx], bpc, bpc_mask);
> if (DEFwmimax > (int)state->wmidx) {
> state->wmileft -= width;
> @@ -429,7 +427,6 @@ static void FNAME(uncompress_row0)(Encoder *encoder,
> Channel *channel,
> decode_eatbits(encoder, codewordlen);
>
> static void FNAME(uncompress_row_seg)(Encoder *encoder, Channel *channel,
> - BYTE *correlate_row,
> const PIXEL * const prev_row,
> PIXEL * const cur_row,
> int i,
> @@ -514,12 +511,11 @@ static void FNAME(uncompress_row)(Encoder *encoder,
> Channel *channel,
> CommonState *state = &channel->state;
> const unsigned int bpc = BPC;
> const unsigned int bpc_mask = BPC_MASK;
> - BYTE * const correlate_row = channel->correlate_row;
> unsigned int pos = 0;
>
> while ((DEFwmimax > (int)state->wmidx) && (state->wmileft <= width)) {
> if (state->wmileft) {
> - FNAME(uncompress_row_seg)(encoder, channel, correlate_row,
> prev_row, cur_row, pos,
> + FNAME(uncompress_row_seg)(encoder, channel, prev_row, cur_row,
> pos,
> pos + state->wmileft, bpc, bpc_mask);
> pos += state->wmileft;
> width -= state->wmileft;
> @@ -531,7 +527,7 @@ static void FNAME(uncompress_row)(Encoder *encoder,
> Channel *channel,
> }
>
> if (width) {
> - FNAME(uncompress_row_seg)(encoder, channel, correlate_row, prev_row,
> cur_row, pos,
> + FNAME(uncompress_row_seg)(encoder, channel, prev_row, cur_row, pos,
> pos + width, bpc, bpc_mask);
> if (DEFwmimax > (int)state->wmidx) {
> state->wmileft -= width;
More information about the Spice-devel
mailing list