From 326aafc7f881efcb16e8d710cfe248afa0794a75 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Mon, 16 Jan 2017 11:45:53 +0100 Subject: [PATCH] Inlined freerdp_image_copy helpers. --- libfreerdp/codec/color.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c index c7515fd4e..75c056709 100644 --- a/libfreerdp/codec/color.c +++ b/libfreerdp/codec/color.c @@ -384,11 +384,11 @@ BOOL freerdp_image_copy_from_pointer_data( } } -static BOOL overlapping(const BYTE* pDstData, UINT32 nXDst, UINT32 nYDst, - UINT32 nDstStep, UINT32 dstBytesPerPixel, - const BYTE* pSrcData, UINT32 nXSrc, UINT32 nYSrc, - UINT32 nSrcStep, UINT32 srcBytesPerPixel, - UINT32 nWidth, UINT32 nHeight) +static INLINE BOOL overlapping(const BYTE* pDstData, UINT32 nXDst, UINT32 nYDst, + UINT32 nDstStep, UINT32 dstBytesPerPixel, + const BYTE* pSrcData, UINT32 nXSrc, UINT32 nYSrc, + UINT32 nSrcStep, UINT32 srcBytesPerPixel, + UINT32 nWidth, UINT32 nHeight) { const BYTE* pDstStart = &pDstData[nXDst * dstBytesPerPixel + nYDst * nDstStep]; const BYTE* pDstEnd = pDstStart + nHeight * nDstStep; @@ -416,7 +416,7 @@ BOOL freerdp_image_copy(BYTE* pDstData, DWORD DstFormat, const UINT32 copyDstWidth = nWidth * dstByte; const UINT32 xSrcOffset = nXSrc * srcByte; const UINT32 xDstOffset = nXDst * dstByte; - BOOL vSrcVFlip = flags & FREERDP_FLIP_VERTICAL; + const BOOL vSrcVFlip = flags & FREERDP_FLIP_VERTICAL; UINT32 srcVOffset = 0; INT32 srcVMultiplier = 1; UINT32 dstVOffset = 0;