Merge branch 'main' into js/fix-241

Author: JimBobSquarePants

src/ImageSharp.Drawing/Processing/ImageBrush.cs

@@ -137,7 +137,7 @@ public ImageBrushApplicator(
                 get
                 {
                     int srcX = ((x - this.offsetX) % this.sourceRegion.Width) + this.sourceRegion.X;
-                    int srcY = ((y - this.offsetY) % this.sourceRegion.Width) + this.sourceRegion.Y;
+                    int srcY = ((y - this.offsetY) % this.sourceRegion.Height) + this.sourceRegion.Y;
                     return this.sourceFrame[srcX, srcY];
                 }
             }

src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor{TPixel}.cs

@@ -70,7 +70,7 @@ void Draw(IEnumerable<DrawingOperation> operations)
                     int startX = operation.RenderLocation.X;
                     int offsetSpan = 0;
 
-                    if (startX + buffer.Height < 0)
+                    if (startY + buffer.Height < 0)
                     {
                         continue;
                     }

tests/ImageSharp.Drawing.Tests/Issues/Issue_270.cs

@@ -0,0 +1,53 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Numerics;
+using SixLabors.Fonts;
+using SixLabors.ImageSharp.Drawing.Processing;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
+using Xunit;
+
+namespace SixLabors.ImageSharp.Drawing.Tests.Issues
+{
+    public class Issue_270
+    {
+        [Fact]
+        public void DoesNotThrowArgumentOutOfRangeException()
+        {
+            if (!TestEnvironment.IsWindows)
+            {
+                return;
+            }
+
+            const int sourceImageWidth = 256;
+            const int sourceImageHeight = 256;
+            const int targetImageWidth = 350;
+            const int targetImageHeight = 350;
+            const float minimumCrashingFontSize = 47;
+            const string text = "Hello, World!";
+
+            Font font = SystemFonts.CreateFont("Arial", minimumCrashingFontSize);
+            Pen pen = Pens.Solid(Color.Black, 1);
+
+            using Image<Rgba32> targetImage = new(targetImageWidth, targetImageHeight, Color.Wheat);
+            using Image<Rgba32> imageBrushImage = new(sourceImageWidth, sourceImageHeight, Color.Black);
+            ImageBrush imageBrush = new(imageBrushImage);
+
+            targetImage.Mutate(x => x.DrawText(CreateTextOptions(font, targetImageWidth), text, imageBrush, pen));
+        }
+
+        private static RichTextOptions CreateTextOptions(Font font, int wrappingLength)
+            => new(font)
+            {
+                Origin = new Vector2(175, 175),
+                TextAlignment = TextAlignment.Center,
+                LayoutMode = LayoutMode.HorizontalTopBottom,
+                WrappingLength = wrappingLength,
+                WordBreaking = WordBreaking.Standard,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                KerningMode = KerningMode.None,
+            };
+    }
+}