Merge pull request #2322 from SixLabors/js/2112

Add DrawImage(Image, Point, Rectangle) method to the DrawImage processor

Author: JimBobSquarePants

src/ImageSharp/Processing/Extensions/Drawing/DrawImageExtensions.cs

@@ -63,7 +63,7 @@ public DrawImageProcessor(
     public IImageProcessor<TPixelBg> CreatePixelSpecificProcessor<TPixelBg>(Configuration configuration, Image<TPixelBg> source, Rectangle sourceRectangle)
         where TPixelBg : unmanaged, IPixel<TPixelBg>
     {
-        var visitor = new ProcessorFactoryVisitor<TPixelBg>(configuration, this, source, sourceRectangle);
+        ProcessorFactoryVisitor<TPixelBg> visitor = new(configuration, this, source, sourceRectangle);
         this.Image.AcceptVisitor(visitor);
         return visitor.Result;
     }
@@ -88,8 +88,7 @@ public ProcessorFactoryVisitor(Configuration configuration, DrawImageProcessor d
 
         public void Visit<TPixelFg>(Image<TPixelFg> image)
             where TPixelFg : unmanaged, IPixel<TPixelFg>
-        {
-            this.Result = new DrawImageProcessor<TPixelBg, TPixelFg>(
+            => this.Result = new DrawImageProcessor<TPixelBg, TPixelFg>(
                 this.configuration,
                 image,
                 this.source,
@@ -98,6 +97,5 @@ public void Visit<TPixelFg>(Image<TPixelFg> image)
                 this.definition.ColorBlendingMode,
                 this.definition.AlphaCompositionMode,
                 this.definition.Opacity);
-        }
     }
 }

src/ImageSharp/Processing/Processors/Drawing/DrawImageProcessor.cs

@@ -89,7 +89,7 @@ protected override void OnFrameApply(ImageFrame<TPixelBg> source)
 
         int width = maxX - minX;
 
-        var workingRect = Rectangle.FromLTRB(minX, minY, maxX, maxY);
+        Rectangle workingRect = Rectangle.FromLTRB(minX, minY, maxX, maxY);
 
         // Not a valid operation because rectangle does not overlap with this image.
         if (workingRect.Width <= 0 || workingRect.Height <= 0)
@@ -98,7 +98,7 @@ protected override void OnFrameApply(ImageFrame<TPixelBg> source)
                 "Cannot draw image because the source image does not overlap the target image.");
         }
 
-        var operation = new RowOperation(source.PixelBuffer, targetImage.Frames.RootFrame.PixelBuffer, blender, configuration, minX, width, locationY, targetX, this.Opacity);
+        DrawImageProcessor<TPixelBg, TPixelFg>.RowOperation operation = new(source.PixelBuffer, targetImage.Frames.RootFrame.PixelBuffer, blender, configuration, minX, width, locationY, targetX, this.Opacity);
         ParallelRowIterator.IterateRows(
             configuration,
             workingRect,

src/ImageSharp/Processing/Processors/Drawing/DrawImageProcessor{TPixelBg,TPixelFg}.cs

@@ -119,9 +119,7 @@ public void DrawImageOfDifferentPixelType<TPixel>(TestImageProvider<TPixel> prov
     public void WorksWithDifferentLocations(TestImageProvider<Rgba32> provider, int x, int y)
     {
         using Image<Rgba32> background = provider.GetImage();
-        using Image<Rgba32> overlay = new(50, 50);
-        Assert.True(overlay.DangerousTryGetSinglePixelMemory(out Memory<Rgba32> overlayMem));
-        overlayMem.Span.Fill(Color.Black);
+        using Image<Rgba32> overlay = new(50, 50, Color.Black.ToRgba32());
 
         background.Mutate(c => c.DrawImage(overlay, new Point(x, y), PixelColorBlendingMode.Normal, 1F));
 
@@ -138,6 +136,31 @@ public void WorksWithDifferentLocations(TestImageProvider<Rgba32> provider, int
             appendSourceFileOrDescription: false);
     }
 
+    [Theory]
+    [WithSolidFilledImages(100, 100, "White", PixelTypes.Rgba32, 10, 10)]
+    [WithSolidFilledImages(100, 100, "White", PixelTypes.Rgba32, 50, 25)]
+    [WithSolidFilledImages(100, 100, "White", PixelTypes.Rgba32, 25, 50)]
+    [WithSolidFilledImages(100, 100, "White", PixelTypes.Rgba32, 50, 50)]
+    public void WorksWithDifferentBounds(TestImageProvider<Rgba32> provider, int width, int height)
+    {
+        using Image<Rgba32> background = provider.GetImage();
+        using Image<Rgba32> overlay = new(50, 50, Color.Black.ToRgba32());
+
+        background.Mutate(c => c.DrawImage(overlay, new Rectangle(0, 0, width, height), PixelColorBlendingMode.Normal, 1F));
+
+        background.DebugSave(
+            provider,
+            testOutputDetails: $"{width}_{height}",
+            appendPixelTypeToFileName: false,
+            appendSourceFileOrDescription: false);
+
+        background.CompareToReferenceOutput(
+            provider,
+            testOutputDetails: $"{width}_{height}",
+            appendPixelTypeToFileName: false,
+            appendSourceFileOrDescription: false);
+    }
+
     [Theory]
     [WithFile(TestImages.Png.Splash, PixelTypes.Rgba32)]
     public void DrawTransformed<TPixel>(TestImageProvider<TPixel> provider)
@@ -158,12 +181,12 @@ public void DrawTransformed<TPixel>(TestImageProvider<TPixel> provider)
         Point position = new((image.Width - blend.Width) / 2, (image.Height - blend.Height) / 2);
         image.Mutate(x => x.DrawImage(blend, position, .75F));
 
-        image.DebugSave(provider, appendSourceFileOrDescription: false, appendPixelTypeToFileName: false);
+        image.DebugSave(provider, appendPixelTypeToFileName: false, appendSourceFileOrDescription: false);
         image.CompareToReferenceOutput(
             ImageComparer.TolerantPercentage(0.002f),
             provider,
-            appendSourceFileOrDescription: false,
-            appendPixelTypeToFileName: false);
+            appendPixelTypeToFileName: false,
+            appendSourceFileOrDescription: false);
     }
 
     [Theory]
@@ -179,9 +202,6 @@ public void NonOverlappingImageThrows(TestImageProvider<Rgba32> provider, int x,
 
         Assert.Contains("does not overlap", ex.ToString());
 
-        void Test()
-        {
-            background.Mutate(context => context.DrawImage(overlay, new Point(x, y), new GraphicsOptions()));
-        }
+        void Test() => background.Mutate(context => context.DrawImage(overlay, new Point(x, y), new GraphicsOptions()));
     }
 }