From c87b2cc93dada83048be9aa33a5a355cdee2502a Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Fri, 5 Jul 2024 14:33:44 +0200
Subject: [PATCH] [primitives,copy] revert single memcpy

copying the while image messes up as the src and destination strides not
necessarily align. (reverts 1a58e74c17a367dbbdd7038ded8ecd03eeddbb5b)
---
 libfreerdp/primitives/prim_copy.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/libfreerdp/primitives/prim_copy.c b/libfreerdp/primitives/prim_copy.c
index 195d289bd..9494cc7e4 100644
--- a/libfreerdp/primitives/prim_copy.c
+++ b/libfreerdp/primitives/prim_copy.c
@@ -236,29 +236,19 @@ pstatus_t generic_image_copy_no_overlap_memcpy(
     SSIZE_T srcVMultiplier, SSIZE_T srcVOffset, SSIZE_T dstVMultiplier, SSIZE_T dstVOffset,
     UINT32 flags)
 {
-	const BOOL vSrcVFlip = (flags & FREERDP_FLIP_VERTICAL) ? TRUE : FALSE;
 	const SSIZE_T dstByte = FreeRDPGetBytesPerPixel(DstFormat);
 	const SSIZE_T srcByte = FreeRDPGetBytesPerPixel(SrcFormat);
 	const SSIZE_T copyDstWidth = nWidth * dstByte;
 	const SSIZE_T xSrcOffset = nXSrc * srcByte;
 	const SSIZE_T xDstOffset = nXDst * dstByte;
 
-	if (!vSrcVFlip && (nDstStep == nSrcStep) && (xSrcOffset == 0) && (xDstOffset == 0))
+	for (SSIZE_T y = 0; y < nHeight; y++)
 	{
-		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++)
-		{
-			const BYTE* WINPR_RESTRICT srcLine =
-			    &pSrcData[srcVMultiplier * (y + nYSrc) * nSrcStep + srcVOffset];
-			BYTE* WINPR_RESTRICT dstLine =
-			    &pDstData[dstVMultiplier * (y + nYDst) * nDstStep + dstVOffset];
-			memcpy(&dstLine[xDstOffset], &srcLine[xSrcOffset], copyDstWidth);
-		}
+		const BYTE* WINPR_RESTRICT srcLine =
+		    &pSrcData[srcVMultiplier * (y + nYSrc) * nSrcStep + srcVOffset];
+		BYTE* WINPR_RESTRICT dstLine =
+		    &pDstData[dstVMultiplier * (y + nYDst) * nDstStep + dstVOffset];
+		memcpy(&dstLine[xDstOffset], &srcLine[xSrcOffset], copyDstWidth);
 	}
 
 	return PRIMITIVES_SUCCESS;