Merge branch 'master' into js/text-path

JimBobSquarePants · web-flow · commit 85daead91f99 · 2022-01-25T21:54:56.000+11:00
diff --git a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
@@ -12,16 +12,16 @@
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
     <PackageTags>Image Draw Shape Path Font</PackageTags>
     <Description>An extension to ImageSharp that allows the drawing of images, paths, and text.</Description>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net472</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;net472</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="..\..\shared-infrastructure\branding\icons\imagesharp.drawing\sixlabors.imagesharp.drawing.128.png" Pack="true" PackagePath="" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15.21" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
+    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15.24" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.0.0-alpha.0.156" />
   </ItemGroup>
 
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />
diff --git a/src/ImageSharp.Drawing/Processing/GradientBrush.cs b/src/ImageSharp.Drawing/Processing/GradientBrush.cs
@@ -159,7 +159,7 @@ public override void Apply(Span<float> scanline, int x, int y)
                     }
                 }
 
-                Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
+                Span<TPixel> destinationRow = this.Target.PixelBuffer.DangerousGetRowSpan(y).Slice(x, scanline.Length);
                 this.Blender.Blend(this.Configuration, destinationRow, destinationRow, overlays, amounts);
             }
 
diff --git a/src/ImageSharp.Drawing/Processing/ImageBrush.cs b/src/ImageSharp.Drawing/Processing/ImageBrush.cs
@@ -162,7 +162,7 @@ public override void Apply(Span<float> scanline, int x, int y)
 
                 int offsetX = x - this.offsetX;
                 int sourceY = ((y - this.offsetY) % this.sourceRegion.Width) + this.sourceRegion.Y;
-                Span<TPixel> sourceRow = this.sourceFrame.GetPixelRowSpan(sourceY);
+                Span<TPixel> sourceRow = this.sourceFrame.PixelBuffer.DangerousGetRowSpan(sourceY);
 
                 for (int i = 0; i < scanline.Length; i++)
                 {
@@ -173,7 +173,7 @@ public override void Apply(Span<float> scanline, int x, int y)
                     overlaySpan[i] = sourceRow[sourceX];
                 }
 
-                Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
+                Span<TPixel> destinationRow = this.Target.PixelBuffer.DangerousGetRowSpan(y).Slice(x, scanline.Length);
                 this.Blender.Blend(
                     this.Configuration,
                     destinationRow,
diff --git a/src/ImageSharp.Drawing/Processing/PathGradientBrush.cs b/src/ImageSharp.Drawing/Processing/PathGradientBrush.cs
@@ -302,7 +302,7 @@ public override void Apply(Span<float> scanline, int x, int y)
                     }
                 }
 
-                Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
+                Span<TPixel> destinationRow = this.Target.PixelBuffer.DangerousGetRowSpan(y).Slice(x, scanline.Length);
                 this.Blender.Blend(this.Configuration, destinationRow, destinationRow, overlays, amounts);
             }
 
diff --git a/src/ImageSharp.Drawing/Processing/PatternBrush.cs b/src/ImageSharp.Drawing/Processing/PatternBrush.cs
@@ -159,7 +159,7 @@ public override void Apply(Span<float> scanline, int x, int y)
                     overlays[i] = this.pattern[patternY, patternX];
                 }
 
-                Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
+                Span<TPixel> destinationRow = this.Target.PixelBuffer.DangerousGetRowSpan(y).Slice(x, scanline.Length);
                 this.Blender.Blend(
                     this.Configuration,
                     destinationRow,
diff --git a/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillPathProcessor{TPixel}.cs b/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillPathProcessor{TPixel}.cs
@@ -121,7 +121,7 @@ protected override void OnFrameApply(ImageFrame<TPixel> source)
                             {
                                 if (hasOnes)
                                 {
-                                    source.GetPixelRowSpan(y).Slice(minX, scanlineWidth).Fill(solidBrushColor);
+                                    source.PixelBuffer.DangerousGetRowSpan(y).Slice(minX, scanlineWidth).Fill(solidBrushColor);
                                 }
 
                                 continue;
diff --git a/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor{TPixel}.cs b/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor{TPixel}.cs
@@ -102,7 +102,7 @@ public void Invoke(in RowInterval rows)
             {
                 for (int y = rows.Min; y < rows.Max; y++)
                 {
-                    this.source.GetPixelRowSpan(y).Slice(this.bounds.X, this.bounds.Width).Fill(this.color);
+                    this.source.PixelBuffer.DangerousGetRowSpan(y).Slice(this.bounds.X, this.bounds.Width).Fill(this.color);
                 }
             }
         }
diff --git a/src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor{TPixel}.cs b/src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor{TPixel}.cs
@@ -35,6 +35,7 @@ protected override void BeforeImageApply()
             this.textRenderer = new CachingGlyphRenderer(
                 this.Configuration.MemoryAllocator,
                 this.definition.Text.Length,
+                this.definition.TextOptions,
                 this.definition.Pen,
                 this.definition.Brush != null,
                 this.definition.DrawingOptions.Transform)
@@ -127,7 +128,7 @@ void Draw(List<DrawingOperation> operations, IBrush brush)
                             for (int row = firstRow; row < end; row++)
                             {
                                 int y = startY + row;
-                                Span<float> span = buffer.GetRowSpan(row).Slice(offsetSpan);
+                                Span<float> span = buffer.DangerousGetRowSpan(row).Slice(offsetSpan);
                                 currentApp.Apply(span, startX, y);
                             }
                         }
@@ -173,22 +174,21 @@ private class CachingGlyphRenderer : IColorGlyphRenderer, IDisposable
             private readonly bool renderFill;
             private bool rasterizationRequired;
 
-            public CachingGlyphRenderer(MemoryAllocator memoryAllocator, int size, IPen pen, bool renderFill, Matrix3x2 transform)
+            public CachingGlyphRenderer(MemoryAllocator memoryAllocator, int size, TextOptions textOptions, IPen pen, bool renderFill, Matrix3x2 transform)
             {
                 this.MemoryAllocator = memoryAllocator;
                 this.currentRenderPosition = default;
                 this.Pen = pen;
                 this.renderFill = renderFill;
                 this.renderOutline = pen != null;
-                this.offset = 2;
+                this.offset = (int)textOptions.Font.Size;
                 if (this.renderFill)
                 {
                     this.FillOperations = new List<DrawingOperation>(size);
                 }
 
                 if (this.renderOutline)
                 {
-                    this.offset = (int)MathF.Ceiling((pen.StrokeWidth * 2) + 2);
                     this.OutlineOperations = new List<DrawingOperation>(size);
                 }
 
@@ -372,7 +372,7 @@ private Buffer2D<float> Render(IPath path)
                 {
                     while (scanner.MoveToNextPixelLine())
                     {
-                        Span<float> scanline = fullBuffer.GetRowSpan(scanner.PixelLineY);
+                        Span<float> scanline = fullBuffer.DangerousGetRowSpan(scanner.PixelLineY);
                         bool scanlineDirty = scanner.ScanCurrentPixelLineInto(0, xOffset, scanline);
 
                         if (scanlineDirty && !graphicsOptions.Antialias)
diff --git a/src/ImageSharp.Drawing/Processing/RecolorBrush.cs b/src/ImageSharp.Drawing/Processing/RecolorBrush.cs
@@ -143,7 +143,7 @@ public override void Apply(Span<float> scanline, int x, int y)
                     overlays[i] = this[offsetX, y];
                 }
 
-                Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);
+                Span<TPixel> destinationRow = this.Target.PixelBuffer.DangerousGetRowSpan(y).Slice(x, scanline.Length);
                 this.Blender.Blend(
                     this.Configuration,
                     destinationRow,
diff --git a/src/ImageSharp.Drawing/Processing/SolidBrush.cs b/src/ImageSharp.Drawing/Processing/SolidBrush.cs
@@ -73,7 +73,7 @@ public SolidBrushApplicator(
             /// <inheritdoc />
             public override void Apply(Span<float> scanline, int x, int y)
             {
-                Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x);
+                Span<TPixel> destinationRow = this.Target.PixelBuffer.DangerousGetRowSpan(y).Slice(x);
 
                 // Constrain the spans to each other
                 if (destinationRow.Length > scanline.Length)
diff --git a/src/ImageSharp.Drawing/Shapes/Text/TextBuilder.cs b/src/ImageSharp.Drawing/Shapes/Text/TextBuilder.cs
@@ -19,7 +19,7 @@ public static class TextBuilder
         /// <returns>The <see cref="IPathCollection"/></returns>
         public static IPathCollection GenerateGlyphs(string text, TextOptions textOptions)
         {
-            GlyphBuilder glyphBuilder = new(textOptions.Origin);
+            GlyphBuilder glyphBuilder = new();
             TextRenderer renderer = new(glyphBuilder);
 
             renderer.RenderText(text, textOptions);
diff --git a/tests/ImageSharp.Drawing.Tests/ConfigurationTests.cs b/tests/ImageSharp.Drawing.Tests/ConfigurationTests.cs
@@ -20,7 +20,7 @@ public class ConfigurationTests
 
         public Configuration DefaultConfiguration { get; }
 
-        private readonly int expectedDefaultConfigurationCount = 5;
+        private readonly int expectedDefaultConfigurationCount = 8;
 
         public ConfigurationTests()
         {
diff --git a/tests/ImageSharp.Drawing.Tests/Drawing/FillLinearGradientBrushTests.cs b/tests/ImageSharp.Drawing.Tests/Drawing/FillLinearGradientBrushTests.cs
@@ -210,7 +210,7 @@ static void VerifyAllRowsAreUnicolor(Image<TPixel> image)
             {
                 for (int y = 0; y < image.Height; y++)
                 {
-                    Span<TPixel> row = image.GetPixelRowSpan(y);
+                    Span<TPixel> row = image.GetRootFramePixelBuffer().DangerousGetRowSpan(y);
                     TPixel firstColorOfRow = row[0];
                     foreach (TPixel p in row)
                     {
diff --git a/tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs b/tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs
@@ -439,6 +439,60 @@ public void CanDrawTextWithEmptyPath()
                 Vector2.Zero));
         }
 
+        [Theory]
+        [WithSolidFilledImages(300, 200, nameof(Color.White), PixelTypes.Rgba32, TestFonts.OpenSans, 32, 75F)]
+        [WithSolidFilledImages(300, 200, nameof(Color.White), PixelTypes.Rgba32, TestFonts.OpenSans, 40, 90F)]
+        public void CanRotateFilledFont_Issue175<TPixel>(
+            TestImageProvider<TPixel> provider,
+            string fontName,
+            int fontSize,
+            float angle)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            Font font = CreateFont(fontName, fontSize);
+            const string text = "QuickTYZ";
+            AffineTransformBuilder builder = new AffineTransformBuilder().AppendRotationDegrees(angle);
+
+            TextOptions textOptions = new(font);
+            FontRectangle bounds = TextMeasurer.Measure(text, textOptions);
+            Matrix3x2 transform = builder.BuildMatrix(Rectangle.Round(new RectangleF(bounds.X, bounds.Y, bounds.Width, bounds.Height)));
+
+            provider.RunValidatingProcessorTest(
+                x => x.SetDrawingTransform(transform).DrawText(textOptions, text, Color.Black),
+                $"F({fontName})-S({fontSize})-A({angle})-{ToTestOutputDisplayText(text)})",
+                TextDrawingComparer,
+                appendPixelTypeToFileName: false,
+                appendSourceFileOrDescription: true);
+        }
+
+        [Theory]
+        [WithSolidFilledImages(300, 200, nameof(Color.White), PixelTypes.Rgba32, TestFonts.OpenSans, 32, 75F, 1)]
+        [WithSolidFilledImages(300, 200, nameof(Color.White), PixelTypes.Rgba32, TestFonts.OpenSans, 40, 90F, 2)]
+        public void CanRotateOutlineFont_Issue175<TPixel>(
+            TestImageProvider<TPixel> provider,
+            string fontName,
+            int fontSize,
+            float angle,
+            int strokeWidth)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            Font font = CreateFont(fontName, fontSize);
+            const string text = "QuickTYZ";
+            AffineTransformBuilder builder = new AffineTransformBuilder().AppendRotationDegrees(angle);
+
+            TextOptions textOptions = new(font);
+            FontRectangle bounds = TextMeasurer.Measure(text, textOptions);
+            Matrix3x2 transform = builder.BuildMatrix(Rectangle.Round(new RectangleF(bounds.X, bounds.Y, bounds.Width, bounds.Height)));
+
+            provider.RunValidatingProcessorTest(
+                x => x.SetDrawingTransform(transform)
+                .DrawText(textOptions, text, Pens.Solid(Color.Black, strokeWidth)),
+                $"F({fontName})-S({fontSize})-A({angle})-STR({strokeWidth})-{ToTestOutputDisplayText(text)})",
+                TextDrawingComparer,
+                appendPixelTypeToFileName: false,
+                appendSourceFileOrDescription: true);
+        }
+
         private static string Repeat(string str, int times) => string.Concat(Enumerable.Repeat(str, times));
 
         private static string ToTestOutputDisplayText(string text)
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/TextBuilderTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/TextBuilderTests.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Numerics;
+using SixLabors.Fonts;
+using Xunit;
+
+namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
+{
+    public class TextBuilderTests
+    {
+        [Fact]
+        public void TextBuilder_Bounds_AreCorrect()
+        {
+            Vector2 position = new(5, 5);
+            var options = new TextOptions(TestFontUtilities.GetFont(TestFonts.OpenSans, 16))
+            {
+                Origin = position
+            };
+
+            string text = "Hello World";
+
+            IPathCollection glyphs = TextBuilder.GenerateGlyphs(text, options);
+
+            RectangleF builderBounds = glyphs.Bounds;
+            FontRectangle measuredBounds = TextMeasurer.MeasureBounds(text, options);
+
+            Assert.Equal(measuredBounds.X, builderBounds.X);
+            Assert.Equal(measuredBounds.Y, builderBounds.Y);
+            Assert.Equal(measuredBounds.Width, builderBounds.Width);
+            Assert.Equal(measuredBounds.Height, builderBounds.Height);
+        }
+    }
+}
diff --git a/tests/ImageSharp.Drawing.Tests/TestFormat.cs b/tests/ImageSharp.Drawing.Tests/TestFormat.cs
@@ -252,7 +252,7 @@ public Task EncodeAsync<TPixel>(Image<TPixel> image, Stream stream, Cancellation
 
         private struct TestPixelForAgnosticDecode : IPixel<TestPixelForAgnosticDecode>
         {
-            public PixelOperations<TestPixelForAgnosticDecode> CreatePixelOperations() => new PixelOperations<TestPixelForAgnosticDecode>();
+            public PixelOperations<TestPixelForAgnosticDecode> CreatePixelOperations() => new();
 
             public void FromScaledVector4(Vector4 vector)
             {
@@ -318,6 +318,10 @@ public void FromRgba64(Rgba64 source)
             {
             }
 
+            public void FromAbgr32(Abgr32 source)
+            {
+            }
+
             public bool Equals(TestPixelForAgnosticDecode other) => false;
         }
     }
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageComparison/ExactImageComparer.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageComparison/ExactImageComparer.cs
@@ -32,8 +32,8 @@ public override ImageSimilarityReport<TPixelA, TPixelB> CompareImagesOrFrames<TP
 
             for (int y = 0; y < actual.Height; y++)
             {
-                Span<TPixelA> aSpan = expected.GetPixelRowSpan(y);
-                Span<TPixelB> bSpan = actual.GetPixelRowSpan(y);
+                Span<TPixelA> aSpan = expected.PixelBuffer.DangerousGetRowSpan(y);
+                Span<TPixelB> bSpan = actual.PixelBuffer.DangerousGetRowSpan(y);
 
                 PixelOperations<TPixelA>.Instance.ToRgba64(configuration, aSpan, aBuffer);
                 PixelOperations<TPixelB>.Instance.ToRgba64(configuration, bSpan, bBuffer);
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageComparison/TolerantImageComparer.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageComparison/TolerantImageComparer.cs
@@ -75,8 +75,8 @@ public override ImageSimilarityReport<TPixelA, TPixelB> CompareImagesOrFrames<TP
 
             for (int y = 0; y < actual.Height; y++)
             {
-                Span<TPixelA> aSpan = expected.GetPixelRowSpan(y);
-                Span<TPixelB> bSpan = actual.GetPixelRowSpan(y);
+                Span<TPixelA> aSpan = expected.PixelBuffer.DangerousGetRowSpan(y);
+                Span<TPixelB> bSpan = actual.PixelBuffer.DangerousGetRowSpan(y);
 
                 PixelOperations<TPixelA>.Instance.ToRgba64(configuration, aSpan, aBuffer);
                 PixelOperations<TPixelB>.Instance.ToRgba64(configuration, bSpan, bBuffer);
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/BasicTestPatternProvider.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/ImageProviders/BasicTestPatternProvider.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Numerics;
+using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.Drawing.Tests
 {
@@ -38,18 +39,18 @@ public override Image<TPixel> GetImage()
 
                 int midY = this.Height / 2;
                 int midX = this.Width / 2;
-
+                Buffer2D<TPixel> imageBuffer = result.GetRootFramePixelBuffer();
                 for (int y = 0; y < midY; y++)
                 {
-                    Span<TPixel> row = result.GetPixelRowSpan(y);
+                    Span<TPixel> row = imageBuffer.DangerousGetRowSpan(y);
 
                     row.Slice(0, midX).Fill(topLeftColor);
                     row.Slice(midX, this.Width - midX).Fill(topRightColor);
                 }
 
                 for (int y = midY; y < this.Height; y++)
                 {
-                    Span<TPixel> row = result.GetPixelRowSpan(y);
+                    Span<TPixel> row = imageBuffer.DangerousGetRowSpan(y);
 
                     row.Slice(0, midX).Fill(bottomLeftColor);
                     row.Slice(midX, this.Width - midX).Fill(bottomRightColor);
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/TestImageExtensions.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/TestImageExtensions.cs
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/TestMemoryAllocator.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/TestMemoryAllocator.cs
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/TestUtils.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/TestUtils.cs
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateFilledFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-Quic).png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateFilledFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-Quic).png
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateFilledFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(40)-A(90)-Quic).png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateFilledFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(40)-A(90)-Quic).png
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateOutlineFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-STR(1)-Quic).png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateOutlineFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-STR(1)-Quic).png
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateOutlineFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(40)-A(90)-STR(2)-Quic).png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateOutlineFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(40)-A(90)-STR(2)-Quic).png
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/FontShapesAreRenderedCorrectly_Solid400x45_(255,255,255,255)_OpenSans-Regular.ttf-20-Sphi-(0,0).png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/FontShapesAreRenderedCorrectly_Solid400x45_(255,255,255,255)_OpenSans-Regular.ttf-20-Sphi-(0,0).png

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public override void Apply(Span<float> scanline, int x, int y)`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
`162`		`- Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);`
	`162`	`+ Span<TPixel> destinationRow = this.Target.PixelBuffer.DangerousGetRowSpan(y).Slice(x, scanline.Length);`
`163`	`163`	`this.Blender.Blend(this.Configuration, destinationRow, destinationRow, overlays, amounts);`
`164`	`164`	`}`
`165`	`165`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public override void Apply(Span<float> scanline, int x, int y)`
`162`	`162`
`163`	`163`	`int offsetX = x - this.offsetX;`
`164`	`164`	`int sourceY = ((y - this.offsetY) % this.sourceRegion.Width) + this.sourceRegion.Y;`
`165`		`- Span<TPixel> sourceRow = this.sourceFrame.GetPixelRowSpan(sourceY);`
	`165`	`+ Span<TPixel> sourceRow = this.sourceFrame.PixelBuffer.DangerousGetRowSpan(sourceY);`
`166`	`166`
`167`	`167`	`for (int i = 0; i < scanline.Length; i++)`
`168`	`168`	`{`
`@@ -173,7 +173,7 @@ public override void Apply(Span<float> scanline, int x, int y)`
`173`	`173`	`overlaySpan[i] = sourceRow[sourceX];`
`174`	`174`	`}`
`175`	`175`
`176`		`- Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);`
	`176`	`+ Span<TPixel> destinationRow = this.Target.PixelBuffer.DangerousGetRowSpan(y).Slice(x, scanline.Length);`
`177`	`177`	`this.Blender.Blend(`
`178`	`178`	`this.Configuration,`
`179`	`179`	`destinationRow,`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ public override void Apply(Span<float> scanline, int x, int y)`
`302`	`302`	`}`
`303`	`303`	`}`
`304`	`304`
`305`		`- Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);`
	`305`	`+ Span<TPixel> destinationRow = this.Target.PixelBuffer.DangerousGetRowSpan(y).Slice(x, scanline.Length);`
`306`	`306`	`this.Blender.Blend(this.Configuration, destinationRow, destinationRow, overlays, amounts);`
`307`	`307`	`}`
`308`	`308`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ protected override void OnFrameApply(ImageFrame<TPixel> source)`
`121`	`121`	`{`
`122`	`122`	`if (hasOnes)`
`123`	`123`	`{`
`124`		`- source.GetPixelRowSpan(y).Slice(minX, scanlineWidth).Fill(solidBrushColor);`
	`124`	`+ source.PixelBuffer.DangerousGetRowSpan(y).Slice(minX, scanlineWidth).Fill(solidBrushColor);`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public void Invoke(in RowInterval rows)`
`102`	`102`	`{`
`103`	`103`	`for (int y = rows.Min; y < rows.Max; y++)`
`104`	`104`	`{`
`105`		`- this.source.GetPixelRowSpan(y).Slice(this.bounds.X, this.bounds.Width).Fill(this.color);`
	`105`	`+ this.source.PixelBuffer.DangerousGetRowSpan(y).Slice(this.bounds.X, this.bounds.Width).Fill(this.color);`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ protected override void BeforeImageApply()`
`35`	`35`	`this.textRenderer = new CachingGlyphRenderer(`
`36`	`36`	`this.Configuration.MemoryAllocator,`
`37`	`37`	`this.definition.Text.Length,`
	`38`	`+ this.definition.TextOptions,`
`38`	`39`	`this.definition.Pen,`
`39`	`40`	`this.definition.Brush != null,`
`40`	`41`	`this.definition.DrawingOptions.Transform)`
`@@ -127,7 +128,7 @@ void Draw(List<DrawingOperation> operations, IBrush brush)`
`127`	`128`	`for (int row = firstRow; row < end; row++)`
`128`	`129`	`{`
`129`	`130`	`int y = startY + row;`
`130`		`- Span<float> span = buffer.GetRowSpan(row).Slice(offsetSpan);`
	`131`	`+ Span<float> span = buffer.DangerousGetRowSpan(row).Slice(offsetSpan);`
`131`	`132`	`currentApp.Apply(span, startX, y);`
`132`	`133`	`}`
`133`	`134`	`}`
`@@ -173,22 +174,21 @@ private class CachingGlyphRenderer : IColorGlyphRenderer, IDisposable`
`173`	`174`	`private readonly bool renderFill;`
`174`	`175`	`private bool rasterizationRequired;`
`175`	`176`
`176`		`- public CachingGlyphRenderer(MemoryAllocator memoryAllocator, int size, IPen pen, bool renderFill, Matrix3x2 transform)`
	`177`	`+ public CachingGlyphRenderer(MemoryAllocator memoryAllocator, int size, TextOptions textOptions, IPen pen, bool renderFill, Matrix3x2 transform)`
`177`	`178`	`{`
`178`	`179`	`this.MemoryAllocator = memoryAllocator;`
`179`	`180`	`this.currentRenderPosition = default;`
`180`	`181`	`this.Pen = pen;`
`181`	`182`	`this.renderFill = renderFill;`
`182`	`183`	`this.renderOutline = pen != null;`
`183`		`- this.offset = 2;`
	`184`	`+ this.offset = (int)textOptions.Font.Size;`
`184`	`185`	`if (this.renderFill)`
`185`	`186`	`{`
`186`	`187`	`this.FillOperations = new List<DrawingOperation>(size);`
`187`	`188`	`}`
`188`	`189`
`189`	`190`	`if (this.renderOutline)`
`190`	`191`	`{`
`191`		`- this.offset = (int)MathF.Ceiling((pen.StrokeWidth * 2) + 2);`
`192`	`192`	`this.OutlineOperations = new List<DrawingOperation>(size);`
`193`	`193`	`}`
`194`	`194`
`@@ -372,7 +372,7 @@ private Buffer2D<float> Render(IPath path)`
`372`	`372`	`{`
`373`	`373`	`while (scanner.MoveToNextPixelLine())`
`374`	`374`	`{`
`375`		`- Span<float> scanline = fullBuffer.GetRowSpan(scanner.PixelLineY);`
	`375`	`+ Span<float> scanline = fullBuffer.DangerousGetRowSpan(scanner.PixelLineY);`
`376`	`376`	`bool scanlineDirty = scanner.ScanCurrentPixelLineInto(0, xOffset, scanline);`
`377`	`377`
`378`	`378`	`if (scanlineDirty && !graphicsOptions.Antialias)`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public override void Apply(Span<float> scanline, int x, int y)`
`143`	`143`	`overlays[i] = this[offsetX, y];`
`144`	`144`	`}`
`145`	`145`
`146`		`- Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x, scanline.Length);`
	`146`	`+ Span<TPixel> destinationRow = this.Target.PixelBuffer.DangerousGetRowSpan(y).Slice(x, scanline.Length);`
`147`	`147`	`this.Blender.Blend(`
`148`	`148`	`this.Configuration,`
`149`	`149`	`destinationRow,`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public SolidBrushApplicator(`
`73`	`73`	`/// <inheritdoc />`
`74`	`74`	`public override void Apply(Span<float> scanline, int x, int y)`
`75`	`75`	`{`
`76`		`- Span<TPixel> destinationRow = this.Target.GetPixelRowSpan(y).Slice(x);`
	`76`	`+ Span<TPixel> destinationRow = this.Target.PixelBuffer.DangerousGetRowSpan(y).Slice(x);`
`77`	`77`
`78`	`78`	`// Constrain the spans to each other`
`79`	`79`	`if (destinationRow.Length > scanline.Length)`