From 7ab7b226d93b3e06cd34e096f82101e8f91a15ad Mon Sep 17 00:00:00 2001
From: Scott Williams <tocsoft@gmail.com>
Date: Fri, 8 Dec 2023 14:06:31 +0000
Subject: [PATCH] handle when foreground overhangs bottom of background

---
 .../DrawImageProcessor{TPixelBg,TPixelFg}.cs  | 14 +++++++++++++
 .../Drawing/DrawImageTests.cs                 | 21 +++++++++++++++++++
 .../Drawing/DrawImageTests/Issue2603.png      |  3 +++
 3 files changed, 38 insertions(+)
 create mode 100644 tests/Images/External/ReferenceOutput/Drawing/DrawImageTests/Issue2603.png

diff --git a/src/ImageSharp/Processing/Processors/Drawing/DrawImageProcessor{TPixelBg,TPixelFg}.cs b/src/ImageSharp/Processing/Processors/Drawing/DrawImageProcessor{TPixelBg,TPixelFg}.cs
index 378ea20fa8..c51df8af80 100644
--- a/src/ImageSharp/Processing/Processors/Drawing/DrawImageProcessor{TPixelBg,TPixelFg}.cs
+++ b/src/ImageSharp/Processing/Processors/Drawing/DrawImageProcessor{TPixelBg,TPixelFg}.cs
@@ -96,6 +96,20 @@ internal class DrawImageProcessor<TPixelBg, TPixelFg> : ImageProcessor<TPixelBg>
             top = 0;
         }
 
+        if (left + foregroundRectangle.Width > source.Width)
+        {
+            // will overhange, lets trim it down
+            int diff = (left + foregroundRectangle.Width) - source.Width;
+            foregroundRectangle.Width -= diff;
+        }
+
+        if (top + foregroundRectangle.Height > source.Height)
+        {
+            // will overhange, lets trim it down
+            int diff = (top + foregroundRectangle.Height) - source.Height;
+            foregroundRectangle.Height -= diff;
+        }
+
         int width = foregroundRectangle.Width;
         int height = foregroundRectangle.Height;
         if (width <= 0 || height <= 0)
diff --git a/tests/ImageSharp.Tests/Drawing/DrawImageTests.cs b/tests/ImageSharp.Tests/Drawing/DrawImageTests.cs
index 8b0db773ab..6cd6e15e25 100644
--- a/tests/ImageSharp.Tests/Drawing/DrawImageTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/DrawImageTests.cs
@@ -251,4 +251,25 @@ public class DrawImageTests
             appendPixelTypeToFileName: false,
             appendSourceFileOrDescription: false);
     }
+
+    [Theory]
+    [WithFile(TestImages.Png.Issue2447, PixelTypes.Rgba32)]
+    public void Issue2603<TPixel>(TestImageProvider<TPixel> provider)
+    where TPixel : unmanaged, IPixel<TPixel>
+    {
+        using Image<TPixel> foreground = provider.GetImage();
+        using Image<Rgba32> background = new(100, 100, new Rgba32(0, 255, 255));
+
+        background.Mutate(c => c.DrawImage(foreground, new Point(80, 80), new Rectangle(32, 32, 32, 32), 1F));
+
+        background.DebugSave(
+            provider,
+            appendPixelTypeToFileName: false,
+            appendSourceFileOrDescription: false);
+
+        background.CompareToReferenceOutput(
+            provider,
+            appendPixelTypeToFileName: false,
+            appendSourceFileOrDescription: false);
+    }
 }
diff --git a/tests/Images/External/ReferenceOutput/Drawing/DrawImageTests/Issue2603.png b/tests/Images/External/ReferenceOutput/Drawing/DrawImageTests/Issue2603.png
new file mode 100644
index 0000000000..1940dbba04
--- /dev/null
+++ b/tests/Images/External/ReferenceOutput/Drawing/DrawImageTests/Issue2603.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:307ef8cea7999e615420740bb0a403a64b24f1fff5356c2ac45c1952f84c5e4c
+size 508