diff options
| author | Jim Grandy <jgrandy@authentic8.com> | 2013-07-08 16:22:38 -0700 |
|---|---|---|
| committer | Jim Grandy <jgrandy@authentic8.com> | 2013-08-22 12:55:29 -0700 |
| commit | d2d22043aac15f72f1e69fa09970cbebb49499e1 (patch) | |
| tree | d1d97aeb00310e6ab441311437597a2c5f3d98ce /xorg/X11R7.6/rdp/rdpup.c | |
| parent | 648470afa1eea156d8501b247363d8e754ab8e88 (diff) | |
| download | xrdp-proprietary-d2d22043aac15f72f1e69fa09970cbebb49499e1.tar.gz xrdp-proprietary-d2d22043aac15f72f1e69fa09970cbebb49499e1.zip | |
rdpup: use out_uint8s instead of out_uint8; rdpdraw.c: resolve bad merge with rdp_is_os, and use a temporary value as final parameter to draw_item_add_img_region
Diffstat (limited to 'xorg/X11R7.6/rdp/rdpup.c')
| -rw-r--r-- | xorg/X11R7.6/rdp/rdpup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg/X11R7.6/rdp/rdpup.c b/xorg/X11R7.6/rdp/rdpup.c index 958a7d92..3cb3267a 100644 --- a/xorg/X11R7.6/rdp/rdpup.c +++ b/xorg/X11R7.6/rdp/rdpup.c @@ -1508,7 +1508,7 @@ rdpup_create_os_surface_bpp(int rdpindex, int width, int height, int bpp) out_uint32_le(g_out_s, rdpindex); out_uint16_le(g_out_s, width); out_uint16_le(g_out_s, height); - out_uint8(g_out_s, bpp); + out_uint8s(g_out_s, bpp); } return 0; } @@ -1858,7 +1858,7 @@ rdpup_send_alpha_area(struct image_data* id, int x, int y, int w, int h) out_uint16_le(g_out_s, lh); out_uint16_le(g_out_s, 0); out_uint16_le(g_out_s, 0); - out_uint8(g_out_s, 8); + out_uint8s(g_out_s, 8); lx += 64; } ly += 64; @@ -2466,7 +2466,7 @@ rdpup_composite(short srcidx, int srcformat, short srcwidth, CARD8 srcrepeat, out_uint16_le(g_out_s, srcidx); out_uint32_le(g_out_s, srcformat); out_uint16_le(g_out_s, srcwidth); - out_uint8(g_out_s, srcrepeat); + out_uint8s(g_out_s, srcrepeat); if (srctransform == 0) { out_uint8s(g_out_s, 10 * 4); @@ -2484,12 +2484,12 @@ rdpup_composite(short srcidx, int srcformat, short srcwidth, CARD8 srcrepeat, out_uint32_le(g_out_s, srctransform->matrix[2][1]); out_uint32_le(g_out_s, srctransform->matrix[2][2]); } - out_uint8(g_out_s, mskflags); + out_uint8s(g_out_s, mskflags); out_uint16_le(g_out_s, mskidx); out_uint32_le(g_out_s, mskformat); out_uint16_le(g_out_s, mskwidth); - out_uint8(g_out_s, mskrepeat); - out_uint8(g_out_s, op); + out_uint8s(g_out_s, mskrepeat); + out_uint8s(g_out_s, op); out_uint16_le(g_out_s, srcx); out_uint16_le(g_out_s, srcy); out_uint16_le(g_out_s, mskx); |