From 59f188a6add2c9ac4b986ccf9724575d3c41da9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?=
 <branimirkaradzic@gmail.com>
Date: Thu, 13 Jun 2024 22:18:23 -0700
Subject: [PATCH] HEIC: Fixed data copy when strides are mismatched.

---
 src/image_decode.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/image_decode.cpp b/src/image_decode.cpp
index 39d0035..ddf16e7 100644
--- a/src/image_decode.cpp
+++ b/src/image_decode.cpp
@@ -844,8 +844,8 @@ namespace bimg
 		heif_image* image;
 		heif_decode_image(handle, &image, heif_colorspace_RGB, heif_chroma_interleaved_RGBA, NULL);
 
-		int32_t stride;
-		const uint8_t* data = heif_image_get_plane_readonly(image, heif_channel_interleaved, &stride);
+		int32_t srcStride;
+		const uint8_t* data = heif_image_get_plane_readonly(image, heif_channel_interleaved, &srcStride);
 
 		ImageContainer* output = NULL;
 		if (NULL != data)
@@ -853,6 +853,7 @@ namespace bimg
 			const bimg::TextureFormat::Enum format = bimg::TextureFormat::RGBA8;
 			const int32_t width  = heif_image_handle_get_width(handle);
 			const int32_t height = heif_image_handle_get_height(handle);
+			const int32_t dstStride = width*4;
 
 			output = imageAlloc(_allocator
 				, format
@@ -862,8 +863,10 @@ namespace bimg
 				, 1
 				, false
 				, false
-				, data
+				, NULL
 				);
+
+			bx::memCopy(output->m_data, dstStride, data, srcStride, dstStride, height);
 		}
 
 		heif_image_release(image);