diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2014-06-18 20:14:23 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2014-06-18 20:14:23 -0700 |
| commit | b61b58b1ad68ba0361e0c81b2eee823099092e04 (patch) | |
| tree | 98746c62a09b15a613fe76187623f5e51a4777e2 /libxrdp/xrdp_orders.c | |
| parent | 66f8a0bf2573554728e366b93f8848bdfd444977 (diff) | |
| parent | b142a59e69ee2b4a721641fe7f5dc9dadb2bb020 (diff) | |
| download | xrdp-proprietary-b61b58b1ad68ba0361e0c81b2eee823099092e04.tar.gz xrdp-proprietary-b61b58b1ad68ba0361e0c81b2eee823099092e04.zip | |
Merge branch 'devel' of github.com:neutrinolabs/xrdp into devel
Diffstat (limited to 'libxrdp/xrdp_orders.c')
| -rw-r--r-- | libxrdp/xrdp_orders.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/libxrdp/xrdp_orders.c b/libxrdp/xrdp_orders.c index 7ba6cf01..88ffda8e 100644 --- a/libxrdp/xrdp_orders.c +++ b/libxrdp/xrdp_orders.c @@ -2322,13 +2322,22 @@ xrdp_orders_send_bitmap(struct xrdp_orders *self, } make_stream(s); - init_stream(s, 16384); + init_stream(s, 16384 * 2); make_stream(temp_s); - init_stream(temp_s, 16384); + init_stream(temp_s, 16384 * 2); p = s->p; i = height; - lines_sending = xrdp_bitmap_compress(data, width, height, s, bpp, 16384, - i - 1, temp_s, e); + if (bpp > 24) + { + lines_sending = xrdp_bitmap32_compress(data, width, height, s, + bpp, 16384, + i - 1, temp_s, e, 0x30); + } + else + { + lines_sending = xrdp_bitmap_compress(data, width, height, s, bpp, 16384, + i - 1, temp_s, e); + } if (lines_sending != height) { @@ -2582,15 +2591,16 @@ xrdp_orders_send_bitmap2(struct xrdp_orders *self, } make_stream(s); - init_stream(s, 16384); + init_stream(s, 16384 * 2); make_stream(temp_s); - init_stream(temp_s, 16384); + init_stream(temp_s, 16384 * 2); p = s->p; i = height; if (bpp > 24) { - lines_sending = xrdp_bitmap32_compress(data, width, height, s, bpp, 16384, - i - 1, temp_s, e); + lines_sending = xrdp_bitmap32_compress(data, width, height, s, + bpp, 16384, + i - 1, temp_s, e, 0x30); } else { |