Use latest ImageSharp build

Author: JimBobSquarePants

samples/DrawShapesWithImageSharp/ImageSharpLogo.cs

@@ -62,7 +62,7 @@ public static void SaveLogo(float size, string path)
                 img.Mutate(i => i.Fill(colors[s], segments[s].Transform(scaler)));
             }
 
-            img.Mutate(i => i.Fill(new Rgba32(0, 0, 0, 170), new ComplexPolygon(new EllipsePolygon(center, 161f), new EllipsePolygon(center, 61f)).Transform(scaler)));
+            img.Mutate(i => i.Fill(Color.FromPixel(new Rgba32(0, 0, 0, 170)), new ComplexPolygon(new EllipsePolygon(center, 161f), new EllipsePolygon(center, 61f)).Transform(scaler)));
 
             string fullPath = System.IO.Path.GetFullPath(System.IO.Path.Combine("Output", path));
 

src/ImageSharp.Drawing/Common/Extensions/GraphicsOptionsExtensions.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using System.Numerics;
-
 namespace SixLabors.ImageSharp.Drawing;
 
 /// <summary>
@@ -28,20 +26,19 @@ public static bool IsOpaqueColorWithoutBlending(this GraphicsOptions options, Co
             return false;
         }
 
-        if (options.AlphaCompositionMode != PixelAlphaCompositionMode.SrcOver
-            && options.AlphaCompositionMode != PixelAlphaCompositionMode.Src)
+        if (options.AlphaCompositionMode is not PixelAlphaCompositionMode.SrcOver and not PixelAlphaCompositionMode.Src)
         {
             return false;
         }
 
-        const float Opaque = 1F;
+        const float opaque = 1f;
 
-        if (options.BlendPercentage != Opaque)
+        if (options.BlendPercentage != opaque)
         {
             return false;
         }
 
-        if (((Vector4)color).W != Opaque)
+        if (color.ToScaledVector4().W != opaque)
         {
             return false;
         }

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

@@ -45,8 +45,8 @@
     <None Include="..\..\shared-infrastructure\branding\icons\imagesharp.drawing\sixlabors.imagesharp.drawing.128.png" Pack="true" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SixLabors.Fonts" Version="2.0.1" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="4.0.0-alpha.0.7" />
+    <PackageReference Include="SixLabors.Fonts" Version="2.0.2" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="4.0.0-alpha.0.4" />
   </ItemGroup>
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />
 </Project>

src/ImageSharp.Drawing/Processing/GradientBrush.cs

@@ -4,7 +4,6 @@
 using System.Numerics;
 using SixLabors.ImageSharp.Drawing.Utilities;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Drawing.Processing;
 
@@ -138,7 +137,7 @@ protected GradientBrushApplicator(
                 float onLocalGradient = (positionOnCompleteGradient - from.Ratio) / (to.Ratio - from.Ratio);
 
                 // TODO: This should use premultiplied vectors to avoid bad blends e.g. red -> brown <- green.
-                return new Color(Vector4.Lerp((Vector4)from.Color, (Vector4)to.Color, onLocalGradient)).ToPixel<TPixel>();
+                return Color.FromScaledVector(Vector4.Lerp(from.Color.ToScaledVector4(), to.Color.ToScaledVector4(), onLocalGradient)).ToPixel<TPixel>();
             }
         }
 

src/ImageSharp.Drawing/Processing/PathGradientBrush.cs

@@ -87,7 +87,7 @@ public override BrushApplicator<TPixel> CreateApplicator<TPixel>(
             this.hasSpecialCenterColor);
 
     private static Color CalculateCenterColor(Color[] colors)
-        => new(colors.Select(c => (Vector4)c).Aggregate((p1, p2) => p1 + p2) / colors.Length);
+        => Color.FromScaledVector(colors.Select(c => c.ToScaledVector4()).Aggregate((p1, p2) => p1 + p2) / colors.Length);
 
     private static float DistanceBetween(Vector2 p1, Vector2 p2) => (p2 - p1).Length();
 
@@ -115,8 +115,8 @@ public Edge(Vector2 start, Vector2 end, Color startColor, Color endColor)
         {
             this.Start = start;
             this.End = end;
-            this.StartColor = (Vector4)startColor;
-            this.EndColor = (Vector4)endColor;
+            this.StartColor = startColor.ToScaledVector4();
+            this.EndColor = endColor.ToScaledVector4();
 
             this.length = DistanceBetween(this.End, this.Start);
         }
@@ -204,7 +204,7 @@ public PathGradientBrushApplicator(
             Vector2[] points = edges.Select(s => s.Start).ToArray();
 
             this.center = points.Aggregate((p1, p2) => p1 + p2) / edges.Count;
-            this.centerColor = (Vector4)centerColor;
+            this.centerColor = centerColor.ToScaledVector4();
             this.hasSpecialCenterColor = hasSpecialCenterColor;
             this.centerPixel = centerColor.ToPixel<TPixel>();
             this.maxDistance = points.Select(p => p - this.center).Max(d => d.Length());
@@ -240,9 +240,7 @@ public PathGradientBrushApplicator(
                         + (u * this.edges[0].EndColor)
                         + (v * this.edges[2].StartColor);
 
-                    TPixel px = default;
-                    px.FromScaledVector4(pointColor);
-                    return px;
+                    return TPixel.FromScaledVector4(pointColor);
                 }
 
                 Vector2 direction = Vector2.Normalize(point - this.center);
@@ -263,9 +261,7 @@ public PathGradientBrushApplicator(
 
                 Vector4 color = Vector4.Lerp(edgeColor, this.centerColor, ratio);
 
-                TPixel pixel = default;
-                pixel.FromScaledVector4(color);
-                return pixel;
+                return TPixel.FromScaledVector4(color);
             }
         }
 

src/ImageSharp.Drawing/Processing/PatternBrush.cs

@@ -54,8 +54,8 @@ public PatternBrush(Color foreColor, Color backColor, bool[,] pattern)
     /// <param name="pattern">The pattern.</param>
     internal PatternBrush(Color foreColor, Color backColor, in DenseMatrix<bool> pattern)
     {
-        var foreColorVector = (Vector4)foreColor;
-        var backColorVector = (Vector4)backColor;
+        Vector4 foreColorVector = foreColor.ToScaledVector4();
+        Vector4 backColorVector = backColor.ToScaledVector4();
         this.pattern = new DenseMatrix<Color>(pattern.Columns, pattern.Rows);
         this.patternVector = new DenseMatrix<Vector4>(pattern.Columns, pattern.Rows);
         for (int i = 0; i < pattern.Data.Length; i++)
@@ -156,8 +156,8 @@ public PatternBrushApplicator(
         public override void Apply(Span<float> scanline, int x, int y)
         {
             int patternY = y % this.pattern.Rows;
-            Span<float> amounts = this.blenderBuffers.AmountSpan.Slice(0, scanline.Length);
-            Span<TPixel> overlays = this.blenderBuffers.OverlaySpan.Slice(0, scanline.Length);
+            Span<float> amounts = this.blenderBuffers.AmountSpan[..scanline.Length];
+            Span<TPixel> overlays = this.blenderBuffers.OverlaySpan[..scanline.Length];
 
             for (int i = 0; i < scanline.Length; i++)
             {

src/ImageSharp.Drawing/Processing/Pen.cs

@@ -51,11 +51,12 @@ protected Pen(Brush strokeFill, float strokeWidth)
     protected Pen(Brush strokeFill, float strokeWidth, float[] strokePattern)
     {
         Guard.NotNull(strokeFill, nameof(strokeFill));
-        Guard.MustBeGreaterThan(strokeWidth, 0, nameof(strokeWidth));
+
+        // Guard.MustBeGreaterThan(strokeWidth, 0, nameof(strokeWidth));
         Guard.NotNull(strokePattern, nameof(strokePattern));
 
         this.StrokeFill = strokeFill;
-        this.StrokeWidth = strokeWidth;
+        this.StrokeWidth = strokeWidth > 0 ? strokeWidth : 1;
         this.pattern = strokePattern;
     }
 

src/ImageSharp.Drawing/Processing/Processors/Text/RichTextGlyphRenderer.cs

@@ -144,7 +144,7 @@ protected override void BeginGlyph(in FontRectangle bounds, in GlyphRendererPara
 
     /// <inheritdoc/>
     public void SetColor(GlyphColor color)
-        => this.currentColor = new Color(new Rgba32(color.Red, color.Green, color.Blue, color.Alpha));
+        => this.currentColor = Color.FromPixel(new Rgba32(color.Red, color.Green, color.Blue, color.Alpha));
 
     public override TextDecorations EnabledDecorations()
     {

src/ImageSharp.Drawing/Processing/RecolorBrush.cs

@@ -100,15 +100,14 @@ public RecolorBrushApplicator(
             float threshold)
             : base(configuration, options, source)
         {
-            this.sourceColor = sourceColor.ToVector4();
+            this.sourceColor = sourceColor.ToScaledVector4();
             this.targetColorPixel = targetColor;
 
+            // TODO: Review this. We can skip the conversion from/to Vector4.
             // Lets hack a min max extremes for a color space by letting the IPackedPixel clamp our values to something in the correct spaces :)
-            var maxColor = default(TPixel);
-            maxColor.FromVector4(new Vector4(float.MaxValue));
-            var minColor = default(TPixel);
-            minColor.FromVector4(new Vector4(float.MinValue));
-            this.threshold = Vector4.DistanceSquared(maxColor.ToVector4(), minColor.ToVector4()) * threshold;
+            TPixel maxColor = TPixel.FromScaledVector4(Vector4.One);
+            TPixel minColor = TPixel.FromVector4(Vector4.Zero);
+            this.threshold = Vector4.DistanceSquared(maxColor.ToScaledVector4(), minColor.ToScaledVector4()) * threshold;
             this.blenderBuffers = new ThreadLocalBlenderBuffers<TPixel>(configuration.MemoryAllocator, source.Width);
         }
 
@@ -118,7 +117,7 @@ public RecolorBrushApplicator(
             {
                 // Offset the requested pixel by the value in the rectangle (the shapes position)
                 TPixel result = this.Target[x, y];
-                var background = result.ToVector4();
+                Vector4 background = result.ToScaledVector4();
                 float distance = Vector4.DistanceSquared(background, this.sourceColor);
                 if (distance <= this.threshold)
                 {
@@ -136,8 +135,8 @@ public RecolorBrushApplicator(
         /// <inheritdoc />
         public override void Apply(Span<float> scanline, int x, int y)
         {
-            Span<float> amounts = this.blenderBuffers.AmountSpan.Slice(0, scanline.Length);
-            Span<TPixel> overlays = this.blenderBuffers.OverlaySpan.Slice(0, scanline.Length);
+            Span<float> amounts = this.blenderBuffers.AmountSpan[..scanline.Length];
+            Span<TPixel> overlays = this.blenderBuffers.OverlaySpan[..scanline.Length];
 
             for (int i = 0; i < scanline.Length; i++)
             {

tests/ImageSharp.Drawing.Benchmarks/Drawing/EllipseStressTest.cs

@@ -0,0 +1,53 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+using System.Runtime.CompilerServices;
+using BenchmarkDotNet.Attributes;
+using SixLabors.ImageSharp.Drawing.Processing;
+using SixLabors.ImageSharp.Drawing.Tests;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
+
+namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing;
+
+[ShortRunJob]
+public class EllipseStressTest
+{
+    private Image<Rgba32> image;
+    private readonly int width = 2560;
+    private readonly int height = 1369;
+    private readonly Random random = new();
+
+    [GlobalSetup]
+    public void Setup() => this.image = new(this.width, this.height, Color.White.ToPixel<Rgba32>());
+
+    [Benchmark]
+    public void DrawImageSharp()
+    {
+        for (int i = 0; i < 20_000; i++)
+        {
+            Color brushColor = Color.FromPixel(new Rgba32((byte)this.Rand(255), (byte)this.Rand(255), (byte)this.Rand(255), (byte)this.Rand(255)));
+            Color penColor = Color.FromPixel(new Rgba32((byte)this.Rand(255), (byte)this.Rand(255), (byte)this.Rand(255), (byte)this.Rand(255)));
+
+            float r = this.Rand(20f) + 1f;
+            float x = this.Rand(this.width);
+            float y = this.Rand(this.height);
+            EllipsePolygon ellipse = new(new PointF(x, y), r);
+            this.image.Mutate(
+                m =>
+                m.Fill(Brushes.Solid(brushColor), ellipse)
+                .Draw(Pens.Solid(penColor, this.Rand(5)), ellipse));
+        }
+    }
+
+    [GlobalCleanup]
+    public void Cleanup()
+    {
+        this.image.SaveAsPng(TestEnvironment.GetFullPath("artifacts\\ellipse-stress.png"));
+        this.image.Dispose();
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private float Rand(float x)
+        => ((float)(((this.random.Next() << 15) | this.random.Next()) & 0x3FFFFFFF) % 1000000) * x / 1000000f;
+}