diff options
| author | jsorg71 <jsorg71> | 2005-11-09 03:46:28 +0000 |
|---|---|---|
| committer | jsorg71 <jsorg71> | 2005-11-09 03:46:28 +0000 |
| commit | e1c89f807c30674e479b0ef12268ccf119c03b8c (patch) | |
| tree | a21d35d76004aa282c70a4fda5d33f6b400f0f20 | |
| parent | cefa77a7a7c5016ab25d869dd8a434704f15e263 (diff) | |
| download | xrdp-proprietary-e1c89f807c30674e479b0ef12268ccf119c03b8c.tar.gz xrdp-proprietary-e1c89f807c30674e479b0ef12268ccf119c03b8c.zip | |
source, then dest bpp
| -rw-r--r-- | rdp/rdp_orders.c | 4 | ||||
| -rw-r--r-- | rdp/rdp_rdp.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rdp/rdp_orders.c b/rdp/rdp_orders.c index 5a68b5ef..3a452312 100644 --- a/rdp/rdp_orders.c +++ b/rdp/rdp_orders.c @@ -888,8 +888,8 @@ rdp_orders_process_memblt(struct rdp_orders* self, struct stream* s, { self->rdp_layer->mod->server_set_opcode(self->rdp_layer->mod, self->state.memblt_opcode); - bmpdata = rdp_orders_convert_bitmap(self->rdp_layer->mod->xrdp_bpp, - self->rdp_layer->mod->rdp_bpp, + bmpdata = rdp_orders_convert_bitmap(self->rdp_layer->mod->rdp_bpp, + self->rdp_layer->mod->xrdp_bpp, bitmap->data, bitmap->width, bitmap->height, self->cache_colormap diff --git a/rdp/rdp_rdp.c b/rdp/rdp_rdp.c index a65a5467..36743dd8 100644 --- a/rdp/rdp_rdp.c +++ b/rdp/rdp_rdp.c @@ -534,7 +534,7 @@ rdp_rdp_process_bitmap_updates(struct rdp_rdp* self, struct stream* s) } in_uint8p(s, data, size); rdp_bitmap_decompress(bmpdata0, width, height, data, size, Bpp); - bmpdata1 = rdp_orders_convert_bitmap(bpp, self->mod->rdp_bpp, + bmpdata1 = rdp_orders_convert_bitmap(bpp, self->mod->xrdp_bpp, bmpdata0, width, height, self->colormap.colors); self->mod->server_paint_rect(self->mod, left, top, cx, cy, bmpdata1, @@ -547,7 +547,7 @@ rdp_rdp_process_bitmap_updates(struct rdp_rdp* self, struct stream* s) data = bmpdata0 + ((height - y) - 1) * (width * Bpp); in_uint8a(s, data, width * Bpp); } - bmpdata1 = rdp_orders_convert_bitmap(bpp, self->mod->rdp_bpp, + bmpdata1 = rdp_orders_convert_bitmap(bpp, self->mod->xrdp_bpp, bmpdata0, width, height, self->colormap.colors); self->mod->server_paint_rect(self->mod, left, top, cx, cy, bmpdata1, |