morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[rdtk] fix integer narrow

Browse Source
This commit is contained in:
akallabeth
2024-09-25 03:53:56 +02:00
parent 911ed13efc
commit 2c7ca7f4b2
1 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
rdtk/librdtk/rdtk_nine_patch.c
View File

@@ -78,18 +78,6 @@ static int rdtk_image_copy_alpha_blend(uint8_t* pDstData, int nDstStep, int nXDs
int rdtk_nine_patch_draw(rdtkSurface* surface, int nXDst, int nYDst, int nWidth, int nHeight, int rdtk_nine_patch_draw(rdtkSurface* surface, int nXDst, int nYDst, int nWidth, int nHeight,
rdtkNinePatch* ninePatch) rdtkNinePatch* ninePatch)
{ {
int x = 0;
int y = 0;
int width = 0;
int height = 0;
int nXSrc = 0;
int nYSrc = 0;
int nSrcStep = 0;
int nDstStep = 0;
uint8_t* pSrcData = NULL;
uint8_t* pDstData = NULL;
int scaleWidth = 0;
WINPR_ASSERT(surface); WINPR_ASSERT(surface);
WINPR_ASSERT(ninePatch); WINPR_ASSERT(ninePatch);
@@ -101,19 +89,20 @@ int rdtk_nine_patch_draw(rdtkSurface* surface, int nXDst, int nYDst, int nWidth,
WINPR_UNUSED(nHeight); WINPR_UNUSED(nHeight);
scaleWidth = nWidth - (ninePatch->width - ninePatch->scaleWidth); int scaleWidth = nWidth - (ninePatch->width - ninePatch->scaleWidth);
nSrcStep = ninePatch->scanline; int nSrcStep = ninePatch->scanline;
pSrcData = ninePatch->data; const uint8_t* pSrcData = ninePatch->data;
pDstData = surface->data; uint8_t* pDstData = surface->data;
nDstStep = surface->scanline; WINPR_ASSERT(surface->scanline <= INT_MAX);
int nDstStep = (int)surface->scanline;
/* top */ /* top */
x = 0; int x = 0;
y = 0; int y = 0;
/* top left */ /* top left */
nXSrc = 0; int nXSrc = 0;
nYSrc = 0; int nYSrc = 0;
width = ninePatch->scaleLeft; int width = ninePatch->scaleLeft;
height = ninePatch->scaleTop; int height = ninePatch->scaleTop;
rdtk_image_copy_alpha_blend(pDstData, nDstStep, nXDst + x, nYDst + y, width, height, pSrcData, rdtk_image_copy_alpha_blend(pDstData, nDstStep, nXDst + x, nYDst + y, width, height, pSrcData,
nSrcStep, nXSrc, nYSrc); nSrcStep, nXSrc, nYSrc);
x += width; x += width;