From 45505f433adfd6b0e61053e9cfcb4cb62da75406 Mon Sep 17 00:00:00 2001 From: ACrazyTown <47027981+ACrazyTown@users.noreply.github.com> Date: Mon, 16 Dec 2024 16:41:37 +0100 Subject: [PATCH] Fix ImageDataUtil.copyPixels crash on Hashlink (#1875) * Fix copyPixels crash on Hashlink * Move nullcheck to C++ * Simplify further * Avoid unneccessary object allocation * Formatting * Simplify by using an if statement --- project/src/ExternalInterface.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/project/src/ExternalInterface.cpp b/project/src/ExternalInterface.cpp index d213c61e7..1718f4aa0 100644 --- a/project/src/ExternalInterface.cpp +++ b/project/src/ExternalInterface.cpp @@ -2052,7 +2052,17 @@ namespace lime { } else { - ImageDataUtil::CopyPixels (image, sourceImage, sourceRect, destPoint, alphaImage, alphaPoint, mergeAlpha); + if (!alphaPoint) { + + Vector2 _alphaPoint = Vector2 (0, 0); + + ImageDataUtil::CopyPixels (image, sourceImage, sourceRect, destPoint, alphaImage, &_alphaPoint, mergeAlpha); + + } else { + + ImageDataUtil::CopyPixels (image, sourceImage, sourceRect, destPoint, alphaImage, alphaPoint, mergeAlpha); + + } }