More clean up and update tests

Author: JimBobSquarePants

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

@@ -13,7 +13,7 @@ public static class ClearExtensions
         /// <summary>
         /// Flood fills the image with the specified color without any blending.
         /// </summary>
-        /// <param name="source">The image this method extends.</param>
+        /// <param name="source">The image processing context.</param>
         /// <param name="color">The color.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext Clear(this IImageProcessingContext source, Color color)
@@ -22,49 +22,32 @@ public static IImageProcessingContext Clear(this IImageProcessingContext source,
         /// <summary>
         /// Flood fills the image with the specified color without any blending.
         /// </summary>
-        /// <param name="source">The image this method extends.</param>
+        /// <param name="source">The image processing context.</param>
         /// <param name="options">The drawing options.</param>
         /// <param name="color">The color.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
-        public static IImageProcessingContext Clear(this IImageProcessingContext source, GraphicsOptions options, Color color)
+        public static IImageProcessingContext Clear(this IImageProcessingContext source, DrawingOptions options, Color color)
             => source.Clear(options, new SolidBrush(color));
 
         /// <summary>
         /// Flood fills the image with the specified brush without any blending.
         /// </summary>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="brush">The details how to fill the region of interest.</param>
+        /// <param name="source">The image processing context.</param>
+        /// <param name="brush">The brush.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext Clear(this IImageProcessingContext source, IBrush brush) =>
-            source.Clear(source.GetGraphicsOptions(), brush);
+            source.Clear(source.GetDrawingOptions(), brush);
 
         /// <summary>
         /// Flood fills the image 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="options">The drawing options.</param>
-        /// <param name="brush">The details how to fill the region of interest.</param>
+        /// <param name="brush">The brush.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
-        public static IImageProcessingContext Clear(
-            this IImageProcessingContext source,
-            DrawingOptions options,
-            IBrush brush)
+        public static IImageProcessingContext Clear(this IImageProcessingContext source, DrawingOptions options, IBrush brush)
             => source.Fill(options.CloneForClearOperation(), brush);
 
-        /// <summary>
-        /// Clones the graphic options and applies changes required to force clearing.
-        /// </summary>
-        /// <param name="options">The options to clone</param>
-        /// <returns>A clone of option with ColorBlendingMode, AlphaCompositionMode, and BlendPercentage set</returns>
-        internal static GraphicsOptions CloneForClearOperation(this GraphicsOptions options)
-        {
-            options = options.DeepClone();
-            options.ColorBlendingMode = PixelFormats.PixelColorBlendingMode.Normal;
-            options.AlphaCompositionMode = PixelFormats.PixelAlphaCompositionMode.Src;
-            options.BlendPercentage = 1;
-            return options;
-        }
-
         /// <summary>
         /// Clones the path graphic options and applies changes required to force clearing.
         /// </summary>

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

@@ -11,7 +11,8 @@ namespace SixLabors.ImageSharp.Drawing.Processing
     public static class ClearPathExtensions
     {
         /// <summary>
-        /// Flood fills the image within the provided region defined by an <see cref="IPath"/> using the specified color without any blending.
+        /// Flood fills the image within the provided region defined by an <see cref="IPath"/> using the specified
+        /// color without any blending.
         /// </summary>
         /// <param name="source">The image processing context.</param>
         /// <param name="color">The color.</param>
@@ -20,50 +21,53 @@ public static class ClearPathExtensions
         public static IImageProcessingContext Clear(
             this IImageProcessingContext source,
             Color color,
-            IPath region) =>
-            source.Clear(new SolidBrush(color), region);
+            IPath region)
+            => source.Clear(new SolidBrush(color), region);
 
         /// <summary>
-        /// Flood fills the image within the provided region defined by an <see cref="IPath"/> using the specified color without any blending.
+        /// Flood fills the image within the provided region defined by an <see cref="IPath"/> using the specified color
+        /// without any blending.
         /// </summary>
         /// <param name="source">The image processing context.</param>
         /// <param name="options">The drawing options.</param>
         /// <param name="color">The color.</param>
-        /// <param name="region">The region of interest to flood fill.</param>
+        /// <param name="region">The <see cref="IPath"/> defining the region to fill.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext Clear(
             this IImageProcessingContext source,
             DrawingOptions options,
             Color color,
-            IPath region) =>
-            source.Clear(options, new SolidBrush(color), region);
+            IPath region)
+            => source.Clear(options, new SolidBrush(color), region);
 
         /// <summary>
-        /// Flood fills the image within the provided region defined by an <see cref="IPath"/> using the specified brush without any blending.
+        /// Flood fills the image within the provided region defined by an <see cref="IPath"/> using the specified brush
+        /// without any blending.
         /// </summary>
         /// <param name="source">The image processing context.</param>
         /// <param name="brush">The brush.</param>
-        /// <param name="region">The region of interest to flood fill.</param>
+        /// <param name="region">The <see cref="IPath"/> defining the region to fill.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext Clear(
             this IImageProcessingContext source,
             IBrush brush,
-            IPath region) =>
-            source.Clear(source.GetDrawingOptions(), brush, region);
+            IPath region)
+            => source.Clear(source.GetDrawingOptions(), brush, region);
 
         /// <summary>
-        /// Flood fills the image within the provided region defined by an <see cref="IPath"/> using the specified brush without any blending.
+        /// Flood fills the image within the provided region defined by an <see cref="IPath"/> using the specified brush
+        /// without any blending.
         /// </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 region of interest to flood fill.</param>
+        /// <param name="region">The <see cref="IPath"/> defining the region to fill.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext Clear(
             this IImageProcessingContext source,
             DrawingOptions options,
             IBrush brush,
-            IPath path) =>
-            source.Fill(options.CloneForClearOperation(), brush, path);
+            IPath region)
+            => source.Fill(options.CloneForClearOperation(), brush, region);
     }
 }

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

@@ -15,49 +15,52 @@ public static class ClearRectangleExtensions
         /// </summary>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
-        /// <param name="rectangle">The rectangle defining the region of interest to flood fill.</param>
+        /// <param name="rectangle">The rectangle defining the region to fill.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext Clear(this IImageProcessingContext source, Color color, RectangleF rectangle)
             => source.Clear(new SolidBrush(color), rectangle);
 
         /// <summary>
-        /// Flood fills the image at the given rectangle bounds with the specified brush without any blending.
+        /// Flood fills the image in the rectangle of the provided rectangle with the specified color without any blending.
         /// </summary>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The drawing options.</param>
-        /// <param name="brush">The brush.</param>
-        /// <param name="rectangle">The rectangle defining the region of interest to flood fill.</param>
+        /// <param name="color">The color.</param>
+        /// <param name="rectangle">The rectangle defining the region to fill.</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,
             RectangleF rectangle)
-            => source.Clear(options, brush, new RectangularPolygon(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height));
+            => source.Clear(options, new SolidBrush(color), rectangle);
 
         /// <summary>
         /// Flood fills the image in the rectangle of the provided rectangle with the specified brush without any blending.
         /// </summary>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
-        /// <param name="rectangle">The rectangle defining the region of interest to flood fill.</param>
+        /// <param name="rectangle">The rectangle defining the region to fill.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
-        public static IImageProcessingContext Clear(this IImageProcessingContext source, IBrush brush, RectangleF rectangle)
+        public static IImageProcessingContext Clear(
+            this IImageProcessingContext source,
+            IBrush brush,
+            RectangleF rectangle)
             => source.Clear(brush, new RectangularPolygon(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height));
 
         /// <summary>
-        /// Flood fills the image in the rectangle of the provided rectangle with the specified color without any blending.
+        /// Flood fills the image at the given rectangle bounds with the specified brush without any blending.
         /// </summary>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The drawing options.</param>
-        /// <param name="color">The color.</param>
-        /// <param name="rectangle">The rectangle defining the region of interest to flood fill.</param>
+        /// <param name="brush">The brush.</param>
+        /// <param name="rectangle">The rectangle defining the region to fill.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext Clear(
             this IImageProcessingContext source,
             DrawingOptions options,
-            Color color,
-            RectangleF rectangle) =>
-            source.Clear(options, new SolidBrush(color), rectangle);
+            IBrush brush,
+            RectangleF rectangle)
+            => source.Clear(options, brush, new RectangularPolygon(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height));
     }
 }

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

@@ -13,16 +13,16 @@ namespace SixLabors.ImageSharp.Drawing.Processing
     public static class ClipPathExtensions
     {
         /// <summary>
-        /// Applies the processing operation against a given clipping path.
+        /// Applies the processing operation within the provided region defined by an <see cref="IPath"/>.
         /// </summary>
         /// <param name="source">The image processing context.</param>
-        /// <param name="region">The target path to operate within.</param>
-        /// <param name="operation">The operation to perform on the source.</param>
+        /// <param name="region">The <see cref="IPath"/> defining the region to operation within.</param>
+        /// <param name="operation">The operation to perform.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext Clip(
             this IImageProcessingContext source,
             IPath region,
             Action<IImageProcessingContext> operation)
-            => source.ApplyProcessor(new RecursiveImageProcessor(source.GetDrawingOptions(), region, operation));
+            => source.ApplyProcessor(new ClipPathProcessor(source.GetDrawingOptions(), region, operation));
     }
 }

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

@@ -7,52 +7,46 @@
 namespace SixLabors.ImageSharp.Drawing.Processing
 {
     /// <summary>
-    /// Adds extensions that allow the filling of regions with various brushes to the <see cref="Image{TPixel}"/> type.
+    /// Adds extensions that allow the flood filling of images.
     /// </summary>
     public static class FillExtensions
     {
         /// <summary>
-        /// Flood fills the image with the specified brush.
+        /// Flood fills the image with the specified color.
         /// </summary>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="options">The drawing options.</param>
-        /// <param name="brush">The details how to fill the region of interest.</param>
+        /// <param name="source">The image processing context.</param>
+        /// <param name="color">The color.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
-        public static IImageProcessingContext Fill(
-            this IImageProcessingContext source,
-            DrawingOptions options,
-            IBrush brush) =>
-            source.ApplyProcessor(new FillProcessor(options, brush));
+        public static IImageProcessingContext Fill(this IImageProcessingContext source, Color color)
+            => source.Fill(new SolidBrush(color));
 
         /// <summary>
-        /// Flood fills the image with the specified brush.
+        /// Flood fills the image with the specified color.
         /// </summary>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="brush">The details how to fill the region of interest.</param>
+        /// <param name="source">The image processing context.</param>
+        /// <param name="options">The drawing options.</param>
+        /// <param name="color">The color.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
-        public static IImageProcessingContext Fill(this IImageProcessingContext source, IBrush brush) =>
-            source.Fill(source.GetDrawingOptions(), brush);
+        public static IImageProcessingContext Fill(this IImageProcessingContext source, DrawingOptions options, Color color)
+            => source.Fill(options, new SolidBrush(color));
 
         /// <summary>
-        /// Flood fills the image with the specified color.
+        /// Flood fills the image with the specified brush.
         /// </summary>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="options">The drawing options.</param>
-        /// <param name="color">The color.</param>
+        /// <param name="source">The image processing context.</param>
+        /// <param name="brush">The brush.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
-        public static IImageProcessingContext Fill(
-            this IImageProcessingContext source,
-            DrawingOptions options,
-            Color color) =>
-            source.Fill(options, new SolidBrush(color));
+        public static IImageProcessingContext Fill(this IImageProcessingContext source, IBrush brush)
+            => source.Fill(source.GetDrawingOptions(), brush);
 
         /// <summary>
-        /// Flood fills the image with the specified color.
+        /// Flood fills the image with the specified brush.
         /// </summary>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="color">The color.</param>
+        /// <param name="source">The image processing context.</param>
+        /// <param name="options">The drawing options.</param>
+        /// <param name="brush">The brush.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
-        public static IImageProcessingContext Fill(this IImageProcessingContext source, Color color) =>
-            source.Fill(new SolidBrush(color));
+        public static IImageProcessingContext Fill(this IImageProcessingContext source, DrawingOptions options, IBrush brush)
+            => source.ApplyProcessor(new FillProcessor(options, brush));
     }
 }