github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed -Wextra sign warnings

Browse Source
This commit is contained in:
Armin Novak 2018-10-24 13:20:46 +02:00
parent 86f08981ef
commit 02f68c35b9
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/X11/xf_gdi.c
View File

@ -245,7 +245,6 @@ static Pixmap xf_brush_new(xfContext* xfc, UINT32 width, UINT32 height,
image->bitmap_bit_order = LSBFirst; image->bitmap_bit_order = LSBFirst;
gc = XCreateGC(xfc->display, xfc->drawable, 0, NULL); gc = XCreateGC(xfc->display, xfc->drawable, 0, NULL);
XPutImage(xfc->display, bitmap, gc, image, 0, 0, 0, 0, width, height); XPutImage(xfc->display, bitmap, gc, image, 0, 0, 0, 0, width, height);
image->data = NULL; image->data = NULL;
XDestroyImage(image); XDestroyImage(image);
@ -577,7 +576,7 @@ static BOOL xf_gdi_invalidate_poly_region(xfContext* xfc, XPoint* points,
static BOOL xf_gdi_polyline(rdpContext* context, static BOOL xf_gdi_polyline(rdpContext* context,
const POLYLINE_ORDER* polyline) const POLYLINE_ORDER* polyline)
{ {
int i; UINT32 i;
int npoints; int npoints;
XColor color; XColor color;
XPoint* points; XPoint* points;
@ -1011,6 +1010,7 @@ static BOOL xf_gdi_update_screen(xfContext* xfc, const BYTE* pSrcData,
bpp = 2; bpp = 2;
else else
bpp = 1; bpp = 1;
XSetFunction(xfc->display, xfc->gc, GXcopy); XSetFunction(xfc->display, xfc->gc, GXcopy);
XSetFillStyle(xfc->display, xfc->gc, FillSolid); XSetFillStyle(xfc->display, xfc->gc, FillSolid);
@ -1021,15 +1021,14 @@ static BOOL xf_gdi_update_screen(xfContext* xfc, const BYTE* pSrcData,
UINT32 width = rects[i].right - rects[i].left; UINT32 width = rects[i].right - rects[i].left;
UINT32 height = rects[i].bottom - rects[i].top; UINT32 height = rects[i].bottom - rects[i].top;
const BYTE* src = pSrcData + top * scanline + bpp * left; const BYTE* src = pSrcData + top * scanline + bpp * left;
image = XCreateImage(xfc->display, xfc->visual, xfc->depth, ZPixmap, 0, image = XCreateImage(xfc->display, xfc->visual, xfc->depth, ZPixmap, 0,
(char*) src, width, height, xfc->scanline_pad, scanline); (char*) src, width, height, xfc->scanline_pad, scanline);
if (!image) if (!image)
break; break;
image->byte_order = LSBFirst; image->byte_order = LSBFirst;
image->bitmap_bit_order = LSBFirst; image->bitmap_bit_order = LSBFirst;
XPutImage(xfc->display, xfc->primary, xfc->gc, image, 0, 0, left, top, width, height); XPutImage(xfc->display, xfc->primary, xfc->gc, image, 0, 0, left, top, width, height);
image->data = NULL; image->data = NULL;
XDestroyImage(image); XDestroyImage(image);
@ -1059,10 +1058,7 @@ static BOOL xf_gdi_surface_bits(rdpContext* context,
cmdRect.top = cmd->destTop; cmdRect.top = cmd->destTop;
cmdRect.right = cmdRect.left + cmd->bmp.width; cmdRect.right = cmdRect.left + cmd->bmp.width;
cmdRect.bottom = cmdRect.top + cmd->bmp.height; cmdRect.bottom = cmdRect.top + cmd->bmp.height;
gdi = context->gdi; gdi = context->gdi;
xf_lock_x11(xfc, FALSE); xf_lock_x11(xfc, FALSE);
switch (cmd->bmp.codecID) switch (cmd->bmp.codecID)

2
client/X11/xf_keyboard.c
View File

@ -160,7 +160,7 @@ void xf_keyboard_key_release(xfContext* xfc, BYTE keycode, KeySym keysym)
void xf_keyboard_release_all_keypress(xfContext* xfc) void xf_keyboard_release_all_keypress(xfContext* xfc)
{ {
int keycode; size_t keycode;
DWORD rdp_scancode; DWORD rdp_scancode;
for (keycode = 0; keycode < ARRAYSIZE(xfc->KeyboardState); keycode++) for (keycode = 0; keycode < ARRAYSIZE(xfc->KeyboardState); keycode++)

2
server/shadow/shadow_client.c
View File

@ -1295,7 +1295,7 @@ static BOOL shadow_client_send_surface_update(rdpShadowClient* client,
const RECTANGLE_16* extents; const RECTANGLE_16* extents;
BYTE* pSrcData; BYTE* pSrcData;
int nSrcStep; int nSrcStep;
int index; UINT32 index;
UINT32 numRects = 0; UINT32 numRects = 0;
const RECTANGLE_16* rects; const RECTANGLE_16* rects;