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

Code cleanup.

This commit is contained in:
Armin Novak 2016-08-09 22:37:32 +02:00 committed by Armin Novak
parent 122f25eb60
commit 5554d805db
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libfreerdp/gdi/clipping.c
View File

@ -34,7 +34,8 @@
#include "clipping.h" #include "clipping.h"
BOOL gdi_SetClipRgn(HGDI_DC hdc, UINT32 nXLeft, UINT32 nYLeft, UINT32 nWidth, UINT32 nHeight) BOOL gdi_SetClipRgn(HGDI_DC hdc, UINT32 nXLeft, UINT32 nYLeft, UINT32 nWidth,
UINT32 nHeight)
{ {
return gdi_SetRgn(hdc->clip, nXLeft, nYLeft, nWidth, nHeight); return gdi_SetRgn(hdc->clip, nXLeft, nYLeft, nWidth, nHeight);
} }
@ -76,14 +77,13 @@ BOOL gdi_SetNullClipRgn(HGDI_DC hdc)
* @return nonzero if there is something to draw, 0 otherwise * @return nonzero if there is something to draw, 0 otherwise
*/ */
BOOL gdi_ClipCoords(HGDI_DC hdc, UINT32 *x, UINT32 *y, UINT32 *w, UINT32 *h, BOOL gdi_ClipCoords(HGDI_DC hdc, UINT32* x, UINT32* y, UINT32* w, UINT32* h,
UINT32 *srcx, UINT32 *srcy) UINT32* srcx, UINT32* srcy)
{ {
GDI_RECT bmp; GDI_RECT bmp;
GDI_RECT clip; GDI_RECT clip;
GDI_RECT coords; GDI_RECT coords;
HGDI_BITMAP hBmp; HGDI_BITMAP hBmp;
int dx = 0; int dx = 0;
int dy = 0; int dy = 0;
BOOL draw = TRUE; BOOL draw = TRUE;
@ -125,13 +125,12 @@ BOOL gdi_ClipCoords(HGDI_DC hdc, UINT32 *x, UINT32 *y, UINT32 *w, UINT32 *h,
gdi_CRgnToRect(*x, *y, *w, *h, &coords); gdi_CRgnToRect(*x, *y, *w, *h, &coords);
if (coords.right >= clip.left && coords.left <= clip.right && if (coords.right >= clip.left && coords.left <= clip.right &&
coords.bottom >= clip.top && coords.top <= clip.bottom) coords.bottom >= clip.top && coords.top <= clip.bottom)
{ {
/* coordinates overlap with clipping region */ /* coordinates overlap with clipping region */
if (coords.left < clip.left) if (coords.left < clip.left)
{ {
dx = (clip.left - coords.left) + 1; dx = (clip.left - coords.left);
coords.left = clip.left; coords.left = clip.left;
} }
@ -140,7 +139,7 @@ BOOL gdi_ClipCoords(HGDI_DC hdc, UINT32 *x, UINT32 *y, UINT32 *w, UINT32 *h,
if (coords.top < clip.top) if (coords.top < clip.top)
{ {
dy = (clip.top - coords.top) + 1; dy = (clip.top - coords.top);
coords.top = clip.top; coords.top = clip.top;
} }
@ -150,7 +149,6 @@ BOOL gdi_ClipCoords(HGDI_DC hdc, UINT32 *x, UINT32 *y, UINT32 *w, UINT32 *h,
else else
{ {
/* coordinates do not overlap with clipping region */ /* coordinates do not overlap with clipping region */
coords.left = 0; coords.left = 0;
coords.right = 0; coords.right = 0;
coords.top = 0; coords.top = 0;
@ -159,22 +157,11 @@ BOOL gdi_ClipCoords(HGDI_DC hdc, UINT32 *x, UINT32 *y, UINT32 *w, UINT32 *h,
} }
if (srcx != NULL) if (srcx != NULL)
{ *srcx += dx;
if (dx > 0)
{
*srcx += dx - 1;
}
}
if (srcy != NULL) if (srcy != NULL)
{ *srcy += dy;
if (dy > 0)
{
*srcy += dy - 1;
}
}
gdi_RectToCRgn(&coords, x, y, w, h); gdi_RectToCRgn(&coords, x, y, w, h);
return draw; return draw;
} }