mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't jpeg compress fonts

This commit is contained in:
Jay Sorg 2012-05-21 10:38:32 -07:00
parent d61f32865d
commit e09f14e6d4
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libxrdp/libxrdp.c
View File

@ -635,11 +635,11 @@ libxrdp_orders_send_raw_bitmap2(struct xrdp_session* session,
int EXPORT_CC
libxrdp_orders_send_bitmap2(struct xrdp_session* session,
int width, int height, int bpp, char* data,
int cache_id, int cache_idx)
int cache_id, int cache_idx, int hints)
{
return xrdp_orders_send_bitmap2((struct xrdp_orders*)session->orders,
width, height, bpp, data,
cache_id, cache_idx);
cache_id, cache_idx, hints);
}
/*****************************************************************************/

2
libxrdp/libxrdp.h
View File

@ -383,7 +383,7 @@ xrdp_orders_send_raw_bitmap2(struct xrdp_orders* self,
int APP_CC
xrdp_orders_send_bitmap2(struct xrdp_orders* self,
int width, int height, int bpp, char* data,
int cache_id, int cache_idx);
int cache_id, int cache_idx, int hints);
int APP_CC
xrdp_orders_send_brush(struct xrdp_orders* self, int width, int height,
int bpp, int type, int size, char* data, int cache_id);

2
libxrdp/libxrdpinc.h
View File

@ -162,7 +162,7 @@ libxrdp_orders_send_raw_bitmap2(struct xrdp_session* session,
int DEFAULT_CC
libxrdp_orders_send_bitmap2(struct xrdp_session* session,
int width, int height, int bpp, char* data,
int cache_id, int cache_idx);
int cache_id, int cache_idx, int hints);
int DEFAULT_CC
libxrdp_query_channel(struct xrdp_session* session, int index,
char* channel_name, int* channel_flags);

10
libxrdp/xrdp_orders.c
View File

@ -1831,8 +1831,12 @@ xrdp_orders_send_raw_bitmap2(struct xrdp_orders* self,
/*****************************************************************************/
static int
xrdp_orders_send_as_jpeg(struct xrdp_orders* self,
int width, int height, int bpp)
int width, int height, int bpp, int hints)
{
if (hints & 1)
{
return 0;
}
if (bpp != 24)
{
return 0;
@ -1854,7 +1858,7 @@ xrdp_orders_send_as_jpeg(struct xrdp_orders* self,
int APP_CC
xrdp_orders_send_bitmap2(struct xrdp_orders* self,
int width, int height, int bpp, char* data,
int cache_id, int cache_idx)
int cache_id, int cache_idx, int hints)
{
int order_flags = 0;
int len = 0;
@ -1890,7 +1894,7 @@ xrdp_orders_send_bitmap2(struct xrdp_orders* self,
p = s->p;
i = height;
is_jpeg = 0;
if (xrdp_orders_send_as_jpeg(self, width, height, bpp))
if (xrdp_orders_send_as_jpeg(self, width, height, bpp, hints))
{
lines_sending = xrdp_jpeg_compress(data, width, height, s, bpp, 16384,
i - 1, temp_s, e);

3
xrdp/xrdp_cache.c
View File

@ -280,7 +280,8 @@ xrdp_cache_add_bitmap(struct xrdp_cache* self, struct xrdp_bitmap* bitmap,
{
libxrdp_orders_send_bitmap2(self->session, bitmap->width,
bitmap->height, bitmap->bpp,
bitmap->data, cache_id, cache_idx);
bitmap->data, cache_id, cache_idx,
hints);
}
else
{