From d2b684ff406688e29d958f1b11c2a81d2c31bf75 Mon Sep 17 00:00:00 2001
From: Nathan Loewen <loewen.nathan@gmail.com>
Date: Sun, 6 Sep 2020 21:14:17 -0500
Subject: [PATCH] let freerdp_image_scale() determine step size

(cherry picked from commit cba618115471a7072902aa137af5962f0e0c4c1e)
---
 libfreerdp/codec/color.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c
index 6c29552..a0fce37 100644
--- a/libfreerdp/codec/color.c
+++ b/libfreerdp/codec/color.c
@@ -777,6 +777,13 @@ BOOL freerdp_image_scale(BYTE* pDstData, DWORD DstFormat, UINT32 nDstStep, UINT3
                          UINT32 nSrcWidth, UINT32 nSrcHeight)
 {
 	BOOL rc = FALSE;
+
+	if (nDstStep == 0)
+		nDstStep = nDstWidth * GetBytesPerPixel(DstFormat);
+
+	if (nSrcStep == 0)
+		nSrcStep = nSrcWidth * GetBytesPerPixel(SrcFormat);
+
 #if defined(SWSCALE_FOUND) || defined(CAIRO_FOUND)
 	const BYTE* src = &pSrcData[nXSrc * GetBytesPerPixel(SrcFormat) + nYSrc * nSrcStep];
 	BYTE* dst = &pDstData[nXDst * GetBytesPerPixel(DstFormat) + nYDst * nDstStep];
-- 
2.7.4