Rip out region.

Author: JimBobSquarePants

src/ImageSharp.Drawing/Primitives/Region.cs

@@ -1,79 +1,84 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Drawing.Processing.Processors.Drawing;
 using SixLabors.ImageSharp.Processing;
 
 namespace SixLabors.ImageSharp.Drawing.Processing
 {
     /// <summary>
-    /// Adds extensions that allow the filling of polygon outlines to the <see cref="Image{TPixel}"/> type.
+    /// Adds extensions that allow the flood filling of polygon outlines without blending.
     /// </summary>
     public static class ClearPathExtensions
     {
         /// <summary>
-        /// Clones the shape graphic options and applies changes required to force clearing.
+        /// Flood fills the image in the path of the provided polygon with the specified brush without any blending.
         /// </summary>
-        /// <param name="shapeOptions">The options to clone</param>
-        /// <returns>A clone of shapeOptions with ColorBlendingMode, AlphaCompositionMode, and BlendPercentage set</returns>
-        internal static DrawingOptions CloneForClearOperation(this DrawingOptions shapeOptions)
-        {
-            GraphicsOptions options = shapeOptions.GraphicsOptions.DeepClone();
-            options.ColorBlendingMode = PixelFormats.PixelColorBlendingMode.Normal;
-            options.AlphaCompositionMode = PixelFormats.PixelAlphaCompositionMode.Src;
-            options.BlendPercentage = 1;
-
-            return new DrawingOptions(options, shapeOptions.ShapeOptions, shapeOptions.TextOptions, shapeOptions.Transform);
-        }
+        /// <param name="source">The image processing context.</param>
+        /// <param name="color">The color.</param>
+        /// <param name="path">The logic path.</param>
+        /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
+        public static IImageProcessingContext Clear(
+            this IImageProcessingContext source,
+            Color color,
+            IPath path) =>
+            source.Clear(new SolidBrush(color), path);
 
         /// <summary>
-        /// Flood fills the image in the shape of the provided polygon with the specified brush without any blending.
+        /// Flood fills the image in the path of the provided polygon with the specified brush without any blending.
         /// </summary>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="options">The graphics options.</param>
-        /// <param name="brush">The brush.</param>
-        /// <param name="path">The shape.</param>
+        /// <param name="source">The image processing context.</param>
+        /// <param name="options">The drawing options.</param>
+        /// <param name="color">The color.</param>
+        /// <param name="path">The logic path.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext Clear(
             this IImageProcessingContext source,
             DrawingOptions options,
-            IBrush brush,
+            Color color,
             IPath path) =>
-            source.Fill(options.CloneForClearOperation(), brush, path);
+            source.Clear(options, new SolidBrush(color), path);
 
         /// <summary>
-        /// Flood fills the image in the shape of the provided polygon with the specified brush without any blending.
+        /// Flood fills the image in the path of the provided polygon with the specified brush without any blending.
         /// </summary>
-        /// <param name="source">The image this method extends.</param>
+        /// <param name="source">The image processing context.</param>
         /// <param name="brush">The brush.</param>
-        /// <param name="path">The path.</param>
+        /// <param name="path">The logic path.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
-        public static IImageProcessingContext Clear(this IImageProcessingContext source, IBrush brush, IPath path) =>
+        public static IImageProcessingContext Clear(
+            this IImageProcessingContext source,
+            IBrush brush,
+            IPath path) =>
             source.Clear(source.GetDrawingOptions(), brush, path);
 
         /// <summary>
-        /// Flood fills the image in the shape of the provided polygon with the specified brush without any blending.
+        /// Flood fills the image in the path of the provided polygon with the specified brush without any blending.
         /// </summary>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="options">The options.</param>
-        /// <param name="color">The color.</param>
-        /// <param name="path">The path.</param>
+        /// <param name="source">The image processing context.</param>
+        /// <param name="options">The drawing options.</param>
+        /// <param name="brush">The brush.</param>
+        /// <param name="path">The logic path.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext Clear(
             this IImageProcessingContext source,
             DrawingOptions options,
-            Color color,
+            IBrush brush,
             IPath path) =>
-            source.Clear(options, new SolidBrush(color), path);
+            source.Fill(options.CloneForClearOperation(), brush, path);
 
         /// <summary>
-        /// Flood fills the image in the shape of the provided polygon with the specified brush without any blending.
+        /// Clones the path graphic options and applies changes required to force clearing.
         /// </summary>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="color">The color.</param>
-        /// <param name="path">The path.</param>
-        /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
-        public static IImageProcessingContext Clear(this IImageProcessingContext source, Color color, IPath path) =>
-            source.Clear(new SolidBrush(color), path);
+        /// <param name="shapeOptions">The drawing options to clone</param>
+        /// <returns>A clone of shapeOptions with ColorBlendingMode, AlphaCompositionMode, and BlendPercentage set</returns>
+        internal static DrawingOptions CloneForClearOperation(this DrawingOptions shapeOptions)
+        {
+            GraphicsOptions options = shapeOptions.GraphicsOptions.DeepClone();
+            options.ColorBlendingMode = PixelFormats.PixelColorBlendingMode.Normal;
+            options.AlphaCompositionMode = PixelFormats.PixelAlphaCompositionMode.Src;
+            options.BlendPercentage = 1F;
+
+            return new DrawingOptions(options, shapeOptions.ShapeOptions, shapeOptions.TextOptions, shapeOptions.Transform);
+        }
     }
 }

src/ImageSharp.Drawing/Primitives/ShapePath.cs

@@ -7,42 +7,30 @@
 namespace SixLabors.ImageSharp.Drawing.Processing
 {
     /// <summary>
-    /// Adds extensions that allow the filling of polygon outlines to the <see cref="Image{TPixel}"/> type.
+    /// Adds extensions that allow the filling of polygon outlines.
     /// </summary>
     public static class FillPathExtensions
     {
         /// <summary>
-        /// Flood fills the image in the shape of the provided polygon with the specified brush.
+        /// Flood fills the image in the shape of the provided polygon with the specified brush..
         /// </summary>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="options">The graphics options.</param>
-        /// <param name="brush">The brush.</param>
-        /// <param name="path">The shape.</param>
+        /// <param name="source">The image processing context.</param>
+        /// <param name="color">The color.</param>
+        /// <param name="path">The logic path.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext Fill(
             this IImageProcessingContext source,
-            DrawingOptions options,
-            IBrush brush,
+            Color color,
             IPath path) =>
-            source.ApplyProcessor(new FillPathProcessor(options, brush, path));
-
-        /// <summary>
-        /// Flood fills the image in the shape of the provided polygon with the specified brush.
-        /// </summary>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="brush">The brush.</param>
-        /// <param name="path">The path.</param>
-        /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
-        public static IImageProcessingContext Fill(this IImageProcessingContext source, IBrush brush, IPath path) =>
-            source.Fill(source.GetDrawingOptions(), brush, path);
+            source.Fill(new SolidBrush(color), path);
 
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush..
         /// </summary>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="options">The options.</param>
+        /// <param name="source">The image processing context.</param>
+        /// <param name="options">The drawing options.</param>
         /// <param name="color">The color.</param>
-        /// <param name="path">The path.</param>
+        /// <param name="path">The logic path.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext Fill(
             this IImageProcessingContext source,
@@ -52,13 +40,31 @@ public static IImageProcessingContext Fill(
             source.Fill(options, new SolidBrush(color), path);
 
         /// <summary>
-        /// Flood fills the image in the shape of the provided polygon with the specified brush..
+        /// Flood fills the image in the shape of the provided polygon with the specified brush.
         /// </summary>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="color">The color.</param>
-        /// <param name="path">The path.</param>
+        /// <param name="source">The image processing context.</param>
+        /// <param name="brush">The brush.</param>
+        /// <param name="path">The logic path.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
-        public static IImageProcessingContext Fill(this IImageProcessingContext source, Color color, IPath path) =>
-            source.Fill(new SolidBrush(color), path);
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            IBrush brush,
+            IPath path) =>
+            source.Fill(source.GetDrawingOptions(), brush, path);
+
+        /// <summary>
+        /// Flood fills the image in the shape of the provided polygon with the specified brush.
+        /// </summary>
+        /// <param name="source">The image processing context.</param>
+        /// <param name="options">The drawing options.</param>
+        /// <param name="brush">The brush.</param>
+        /// <param name="path">The shape.</param>
+        /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
+        public static IImageProcessingContext Fill(
+            this IImageProcessingContext source,
+            DrawingOptions options,
+            IBrush brush,
+            IPath path) =>
+            source.ApplyProcessor(new FillPathProcessor(options, brush, path));
     }
 }