Merge pull request #223 from SixLabors/js/fix-221

Use correct dimension for sourceY

Author: JimBobSquarePants

src/ImageSharp.Drawing/Processing/ImageBrush.cs

@@ -161,7 +161,7 @@ public override void Apply(Span<float> scanline, int x, int y)
                 Span<TPixel> overlaySpan = overlay.Memory.Span;
 
                 int offsetX = x - this.offsetX;
-                int sourceY = ((y - this.offsetY) % this.sourceRegion.Width) + this.sourceRegion.Y;
+                int sourceY = ((y - this.offsetY) % this.sourceRegion.Height) + this.sourceRegion.Y;
                 Span<TPixel> sourceRow = this.sourceFrame.PixelBuffer.DangerousGetRowSpan(sourceY);
 
                 for (int i = 0; i < scanline.Length; i++)

tests/ImageSharp.Drawing.Tests/Drawing/FillImageBrushTests.cs

@@ -33,17 +33,52 @@ public void UseBrushOfDifferentPixelType<TPixel>(TestImageProvider<TPixel> provi
             where TPixel : unmanaged, IPixel<TPixel>
         {
             byte[] data = TestFile.Create(TestImages.Png.Ducky).Bytes;
-            using (Image<TPixel> background = provider.GetImage())
-            using (Image overlay = provider.PixelType == PixelTypes.Rgba32
-                                       ? (Image)Image.Load<Bgra32>(data)
-                                       : Image.Load<Rgba32>(data))
-            {
-                var brush = new ImageBrush(overlay);
-                background.Mutate(c => c.Fill(brush));
+            using Image<TPixel> background = provider.GetImage();
+            using Image overlay = provider.PixelType == PixelTypes.Rgba32
+                                       ? Image.Load<Bgra32>(data)
+                                       : Image.Load<Rgba32>(data);
 
-                background.DebugSave(provider, appendSourceFileOrDescription: false);
-                background.CompareToReferenceOutput(provider, appendSourceFileOrDescription: false);
-            }
+            var brush = new ImageBrush(overlay);
+            background.Mutate(c => c.Fill(brush));
+
+            background.DebugSave(provider, appendSourceFileOrDescription: false);
+            background.CompareToReferenceOutput(provider, appendSourceFileOrDescription: false);
+        }
+
+        [Theory]
+        [WithTestPatternImage(200, 200, PixelTypes.Rgba32)]
+        public void CanDrawLandscapeImage<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            byte[] data = TestFile.Create(TestImages.Png.Ducky).Bytes;
+            using Image<TPixel> background = provider.GetImage();
+            using Image overlay = Image.Load<Rgba32>(data);
+
+            overlay.Mutate(c => c.Crop(new Rectangle(0, 0, 125, 90)));
+
+            var brush = new ImageBrush(overlay);
+            background.Mutate(c => c.Fill(brush));
+
+            background.DebugSave(provider, appendSourceFileOrDescription: false);
+            background.CompareToReferenceOutput(provider, appendSourceFileOrDescription: false);
+        }
+
+        [Theory]
+        [WithTestPatternImage(200, 200, PixelTypes.Rgba32)]
+        public void CanDrawPortraitImage<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            byte[] data = TestFile.Create(TestImages.Png.Ducky).Bytes;
+            using Image<TPixel> background = provider.GetImage();
+            using Image overlay = Image.Load<Rgba32>(data);
+
+            overlay.Mutate(c => c.Crop(new Rectangle(0, 0, 90, 125)));
+
+            var brush = new ImageBrush(overlay);
+            background.Mutate(c => c.Fill(brush));
+
+            background.DebugSave(provider, appendSourceFileOrDescription: false);
+            background.CompareToReferenceOutput(provider, appendSourceFileOrDescription: false);
         }
     }
 }