diff options
| author | speidy <speidy@gmail.com> | 2014-03-02 01:39:34 +0200 |
|---|---|---|
| committer | speidy <speidy@gmail.com> | 2014-03-02 01:39:34 +0200 |
| commit | 1f1e803140ea96b81ac4700a6759a9617d0f2fd2 (patch) | |
| tree | e9d2761170ec2461f178a595482507700879deee /libxrdp/xrdp_orders.c | |
| parent | 80204e2536327f46610d5925c552aff235e9f447 (diff) | |
| parent | 0b18909f269ee582ec22bb808839c4434a0da3e7 (diff) | |
| download | xrdp-proprietary-1f1e803140ea96b81ac4700a6759a9617d0f2fd2.tar.gz xrdp-proprietary-1f1e803140ea96b81ac4700a6759a9617d0f2fd2.zip | |
Merge ../../neutrinolabs/xrdp into fastpath
Conflicts:
libxrdp/libxrdp.c
libxrdp/libxrdp.h
libxrdp/xrdp_iso.c
libxrdp/xrdp_sec.c
libxrdp/xrdp_tcp.c
xrdp/xrdp.ini
Diffstat (limited to 'libxrdp/xrdp_orders.c')
| -rw-r--r-- | libxrdp/xrdp_orders.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libxrdp/xrdp_orders.c b/libxrdp/xrdp_orders.c index 0e2d90d2..317e1135 100644 --- a/libxrdp/xrdp_orders.c +++ b/libxrdp/xrdp_orders.c @@ -2570,8 +2570,16 @@ xrdp_orders_send_bitmap2(struct xrdp_orders *self, init_stream(temp_s, 16384); 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); + } + else + { + lines_sending = xrdp_bitmap_compress(data, width, height, s, bpp, 16384, + i - 1, temp_s, e); + } if (lines_sending != height) { |