'correlation_row' is always set to channel->colleration_row, and we already pass 'channel' as an argument. Signed-off-by: Christophe Fergeau <cfergeau@xxxxxxxxxx> --- common/quic_tmpl.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/common/quic_tmpl.c b/common/quic_tmpl.c index 7a0c898..e10c940 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, @@ -331,6 +330,7 @@ static void FNAME(uncompress_row0_seg)(Encoder *encoder, Channel *channel, int i const unsigned int bpc_mask) { CommonState *state = &channel->state; + BYTE * const correlate_row = channel->correlate_row; int stopidx; spice_assert(end - i > 0); @@ -382,12 +382,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 +399,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 +428,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, @@ -438,6 +436,7 @@ static void FNAME(uncompress_row_seg)(Encoder *encoder, Channel *channel, const unsigned int bpc_mask) { CommonState *state = &channel->state; + BYTE * const correlate_row = channel->correlate_row; const unsigned int waitmask = bppmask[state->wmidx]; int stopidx; int run_index = 0; @@ -514,12 +513,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 +529,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; -- 2.13.3 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel