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

[primitives,copy] revert single memcpy

Browse Source 
copying the while image messes up as the src and destination strides not
necessarily align. (reverts 1a58e74c17)
This commit is contained in:
akallabeth 2024-07-05 14:33:44 +02:00
parent 81203e7e83
commit c87b2cc93d
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libfreerdp/primitives/prim_copy.c
View File

@ -236,21 +236,12 @@ pstatus_t generic_image_copy_no_overlap_memcpy(
SSIZE_T srcVMultiplier, SSIZE_T srcVOffset, SSIZE_T dstVMultiplier, SSIZE_T dstVOffset, SSIZE_T srcVMultiplier, SSIZE_T srcVOffset, SSIZE_T dstVMultiplier, SSIZE_T dstVOffset,
UINT32 flags) UINT32 flags)
{ {
const BOOL vSrcVFlip = (flags & FREERDP_FLIP_VERTICAL) ? TRUE : FALSE;
const SSIZE_T dstByte = FreeRDPGetBytesPerPixel(DstFormat); const SSIZE_T dstByte = FreeRDPGetBytesPerPixel(DstFormat);
const SSIZE_T srcByte = FreeRDPGetBytesPerPixel(SrcFormat); const SSIZE_T srcByte = FreeRDPGetBytesPerPixel(SrcFormat);
const SSIZE_T copyDstWidth = nWidth * dstByte; const SSIZE_T copyDstWidth = nWidth * dstByte;
const SSIZE_T xSrcOffset = nXSrc * srcByte; const SSIZE_T xSrcOffset = nXSrc * srcByte;
const SSIZE_T xDstOffset = nXDst * dstByte; const SSIZE_T xDstOffset = nXDst * dstByte;
if (!vSrcVFlip && (nDstStep == nSrcStep) && (xSrcOffset == 0) && (xDstOffset == 0))
{
const void* src = &pSrcData[1ull * nYSrc * nSrcStep];
void* dst = &pDstData[1ull * nYDst * nDstStep];
memcpy(dst, src, 1ull * nDstStep * nHeight);
}
else
{
for (SSIZE_T y = 0; y < nHeight; y++) for (SSIZE_T y = 0; y < nHeight; y++)
{ {
const BYTE* WINPR_RESTRICT srcLine = const BYTE* WINPR_RESTRICT srcLine =
@ -259,7 +250,6 @@ pstatus_t generic_image_copy_no_overlap_memcpy(
&pDstData[dstVMultiplier * (y + nYDst) * nDstStep + dstVOffset]; &pDstData[dstVMultiplier * (y + nYDst) * nDstStep + dstVOffset];
memcpy(&dstLine[xDstOffset], &srcLine[xSrcOffset], copyDstWidth); memcpy(&dstLine[xDstOffset], &srcLine[xSrcOffset], copyDstWidth);
} }
}
return PRIMITIVES_SUCCESS; return PRIMITIVES_SUCCESS;
} }