Pixel-agnostic Drawing processors and extensions

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

@@ -39,9 +39,9 @@
 
   <ItemGroup>
     <AdditionalFiles Include="..\..\standards\stylecop.json" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
     <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta0008" />
     <PackageReference Include="SixLabors.Shapes" Version="1.0.0-beta0008" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.1-rc.114" PrivateAssets="All" />
   </ItemGroup>
 
   <PropertyGroup>

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=processing_005Cextensions/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/ImageSharp.Drawing/Processing/BrushApplicator.cs

@@ -44,7 +44,7 @@ internal BrushApplicator(ImageFrame<TPixel> target, GraphicsOptions options)
         /// <summary>
         /// Gets the blend percentage
         /// </summary>
-        protected GraphicsOptions Options { get; private set; }
+        protected GraphicsOptions Options { get; }
 
         /// <summary>
         /// Gets the color for a single pixel.

src/ImageSharp.Drawing/Processing/Brushes.cs

@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.Processing
     /// <summary>
     /// A collection of methods for creating generic brushes.
     /// </summary>
-    /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
+    /// <returns>A New <see cref="PatternBrush"/></returns>
     public static class Brushes
     {
         /// <summary>
@@ -94,163 +94,131 @@ public static class Brushes
         /// Create as brush that will paint a solid color
         /// </summary>
         /// <param name="color">The color.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static SolidBrush<TPixel> Solid<TPixel>(TPixel color)
-            where TPixel : struct, IPixel<TPixel>
-            => new SolidBrush<TPixel>(color);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static SolidBrush Solid(Color color) => new SolidBrush(color);
 
         /// <summary>
         /// Create as brush that will paint a Percent10 Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Percent10<TPixel>(TPixel foreColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, NamedColors<TPixel>.Transparent, Percent10Pattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Percent10(Color foreColor) =>
+            new PatternBrush(foreColor, Color.Transparent, Percent10Pattern);
 
         /// <summary>
         /// Create as brush that will paint a Percent10 Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Percent10<TPixel>(TPixel foreColor, TPixel backColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, backColor, Percent10Pattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Percent10(Color foreColor, Color backColor) =>
+            new PatternBrush(foreColor, backColor, Percent10Pattern);
 
         /// <summary>
         /// Create as brush that will paint a Percent20 Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Percent20<TPixel>(TPixel foreColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, NamedColors<TPixel>.Transparent, Percent20Pattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Percent20(Color foreColor) =>
+            new PatternBrush(foreColor, Color.Transparent, Percent20Pattern);
 
         /// <summary>
         /// Create as brush that will paint a Percent20 Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Percent20<TPixel>(TPixel foreColor, TPixel backColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, backColor, Percent20Pattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Percent20(Color foreColor, Color backColor) =>
+            new PatternBrush(foreColor, backColor, Percent20Pattern);
 
         /// <summary>
         /// Create as brush that will paint a Horizontal Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Horizontal<TPixel>(TPixel foreColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, NamedColors<TPixel>.Transparent, HorizontalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Horizontal(Color foreColor) =>
+            new PatternBrush(foreColor, Color.Transparent, HorizontalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Horizontal Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Horizontal<TPixel>(TPixel foreColor, TPixel backColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, backColor, HorizontalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Horizontal(Color foreColor, Color backColor) =>
+            new PatternBrush(foreColor, backColor, HorizontalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Min Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Min<TPixel>(TPixel foreColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, NamedColors<TPixel>.Transparent, MinPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Min(Color foreColor) => new PatternBrush(foreColor, Color.Transparent, MinPattern);
 
         /// <summary>
         /// Create as brush that will paint a Min Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Min<TPixel>(TPixel foreColor, TPixel backColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, backColor, MinPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Min(Color foreColor, Color backColor) =>
+            new PatternBrush(foreColor, backColor, MinPattern);
 
         /// <summary>
         /// Create as brush that will paint a Vertical Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Vertical<TPixel>(TPixel foreColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, NamedColors<TPixel>.Transparent, VerticalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Vertical(Color foreColor) =>
+            new PatternBrush(foreColor, Color.Transparent, VerticalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Vertical Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> Vertical<TPixel>(TPixel foreColor, TPixel backColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, backColor, VerticalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush Vertical(Color foreColor, Color backColor) =>
+            new PatternBrush(foreColor, backColor, VerticalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Forward Diagonal Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> ForwardDiagonal<TPixel>(TPixel foreColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, NamedColors<TPixel>.Transparent, ForwardDiagonalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush ForwardDiagonal(Color foreColor) =>
+            new PatternBrush(foreColor, Color.Transparent, ForwardDiagonalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Forward Diagonal Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> ForwardDiagonal<TPixel>(TPixel foreColor, TPixel backColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, backColor, ForwardDiagonalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush ForwardDiagonal(Color foreColor, Color backColor) =>
+            new PatternBrush(foreColor, backColor, ForwardDiagonalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Backward Diagonal Hatch Pattern with the specified foreground color and a
         /// transparent background.
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> BackwardDiagonal<TPixel>(TPixel foreColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, NamedColors<TPixel>.Transparent, BackwardDiagonalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush BackwardDiagonal(Color foreColor) =>
+            new PatternBrush(foreColor, Color.Transparent, BackwardDiagonalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Backward Diagonal Hatch Pattern with the specified colors
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <returns>A New <see cref="PatternBrush{TPixel}"/></returns>
-        public static PatternBrush<TPixel> BackwardDiagonal<TPixel>(TPixel foreColor, TPixel backColor)
-            where TPixel : struct, IPixel<TPixel>
-            => new PatternBrush<TPixel>(foreColor, backColor, BackwardDiagonalPattern);
+        /// <returns>A New <see cref="PatternBrush"/></returns>
+        public static PatternBrush BackwardDiagonal(Color foreColor, Color backColor) =>
+            new PatternBrush(foreColor, backColor, BackwardDiagonalPattern);
     }
 }

src/ImageSharp.Drawing/Processing/ColorStop{TPixel}.cs → src/ImageSharp.Drawing/Processing/ColorStop.cs

@@ -10,17 +10,15 @@ namespace SixLabors.ImageSharp.Processing
     /// <summary>
     /// A struct that defines a single color stop.
     /// </summary>
-    /// <typeparam name="TPixel">The pixel format.</typeparam>
     [DebuggerDisplay("ColorStop({Ratio} -> {Color}")]
-    public struct ColorStop<TPixel>
-        where TPixel : struct, IPixel<TPixel>
+    public readonly struct ColorStop
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="ColorStop{TPixel}" /> struct.
+        /// Initializes a new instance of the <see cref="ColorStop" /> struct.
         /// </summary>
         /// <param name="ratio">Where should it be? 0 is at the start, 1 at the end of the Gradient.</param>
         /// <param name="color">What color should be used at that point?</param>
-        public ColorStop(float ratio, TPixel color)
+        public ColorStop(float ratio, in Color color)
         {
             this.Ratio = ratio;
             this.Color = color;
@@ -34,6 +32,6 @@ public ColorStop(float ratio, TPixel color)
         /// <summary>
         /// Gets the color to be used.
         /// </summary>
-        public TPixel Color { get; }
+        public Color Color { get; }
     }
 }