mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[gdi,graphics] fix glyph bounds #9454

Browse Source
This commit is contained in:
akallabeth 2023-10-19 17:05:44 +02:00 committed by Martin Fleisz
parent 99a0a28d77
commit 78d736b481
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libfreerdp/gdi/graphics.c
View File

@ -369,21 +369,6 @@ static BOOL gdi_Glyph_Draw(rdpContext* context, const rdpGlyph* glyph, INT32 x,
return rc; return rc;
} }
static BOOL gdi_Glyph_SetBounds(rdpContext* context, INT32 x, INT32 y, INT32 width, INT32 height)
{
rdpGdi* gdi;
if (!context || !context->gdi)
return FALSE;
gdi = context->gdi;
if (!gdi->drawing || !gdi->drawing->hdc)
return FALSE;
return gdi_SetClipRgn(gdi->drawing->hdc, x, y, width, height);
}
static BOOL gdi_Glyph_BeginDraw(rdpContext* context, INT32 x, INT32 y, INT32 width, INT32 height, static BOOL gdi_Glyph_BeginDraw(rdpContext* context, INT32 x, INT32 y, INT32 width, INT32 height,
UINT32 bgcolor, UINT32 fgcolor, BOOL fOpRedundant) UINT32 bgcolor, UINT32 fgcolor, BOOL fOpRedundant)
{ {
@ -458,8 +443,8 @@ static BOOL gdi_Glyph_EndDraw(rdpContext* context, INT32 x, INT32 y, INT32 width
/* Graphics Module */ /* Graphics Module */
BOOL gdi_register_graphics(rdpGraphics* graphics) BOOL gdi_register_graphics(rdpGraphics* graphics)
{ {
rdpBitmap bitmap; rdpBitmap bitmap = { 0 };
rdpGlyph glyph; rdpGlyph glyph = { 0 };
bitmap.size = sizeof(gdiBitmap); bitmap.size = sizeof(gdiBitmap);
bitmap.New = gdi_Bitmap_New; bitmap.New = gdi_Bitmap_New;
bitmap.Free = gdi_Bitmap_Free; bitmap.Free = gdi_Bitmap_Free;
@ -473,7 +458,6 @@ BOOL gdi_register_graphics(rdpGraphics* graphics)
glyph.Draw = gdi_Glyph_Draw; glyph.Draw = gdi_Glyph_Draw;
glyph.BeginDraw = gdi_Glyph_BeginDraw; glyph.BeginDraw = gdi_Glyph_BeginDraw;
glyph.EndDraw = gdi_Glyph_EndDraw; glyph.EndDraw = gdi_Glyph_EndDraw;
glyph.SetBounds = gdi_Glyph_SetBounds;
graphics_register_glyph(graphics, &glyph); graphics_register_glyph(graphics, &glyph);
return TRUE; return TRUE;
} }