source, then dest bpp

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

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,