Cleanup

Author: JimBobSquarePants

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

@@ -477,9 +477,9 @@ private Matrix3x2 ComputeTransform(in FontRectangle bounds)
             Vector2 half = new(bounds.Width * .5F, 0);
             SegmentInfo pathPoint = this.path.PointAlongPath(bounds.Left + half.X);
 
-            // Now offset our target point since we're aligning the top-left location of our glyph against the path.
-            Vector2 targetPoint = (Vector2)pathPoint.Point - bounds.Location - half + new Vector2(0, bounds.Top);
-            return Matrix3x2.CreateTranslation(targetPoint) * Matrix3x2.CreateRotation(pathPoint.Angle - MathF.PI, (Vector2)pathPoint.Point);
+            // Now offset to our target point since we're aligning the top-left location of our glyph against the path.
+            Vector2 translation = (Vector2)pathPoint.Point - bounds.Location - half + new Vector2(0, bounds.Top);
+            return Matrix3x2.CreateTranslation(translation) * Matrix3x2.CreateRotation(pathPoint.Angle - MathF.PI, (Vector2)pathPoint.Point);
         }
 
         private Buffer2D<float> Render(IPath path)

src/ImageSharp.Drawing/Shapes/InternalPath.cs

@@ -171,7 +171,7 @@ internal SegmentInfo PointAlongPath(float distanceAlongPath)
             // Closed paths will never reach this point.
             // For open paths we're going to create a new virtual point that extends past the path.
             // The position and angle for that point are calculated based upon the last two points.
-            PointF a = this.points[this.points.Length >= 2 ? this.points.Length - 2 : 0].Point;
+            PointF a = this.points[Math.Max(this.points.Length - 2, 0)].Point;
             PointF b = this.points[this.points.Length - 1].Point;
             Vector2 delta = a - b;
             float angle = (float)(Math.Atan2(delta.Y, delta.X) % (Math.PI * 2));

src/ImageSharp.Drawing/Shapes/Text/PathGlyphBuilder.cs

@@ -43,9 +43,9 @@ private void TransformGlyph(in FontRectangle bounds)
             Vector2 half = new(bounds.Width * .5F, 0);
             SegmentInfo pathPoint = this.path.PointAlongPath(bounds.Left + half.X);
 
-            // Now offset our target point since we're aligning the top-left location of our glyph against the path.
-            Vector2 targetPoint = (Vector2)pathPoint.Point - bounds.Location - half + new Vector2(0, bounds.Top);
-            Matrix3x2 matrix = Matrix3x2.CreateTranslation(targetPoint) * Matrix3x2.CreateRotation(pathPoint.Angle - MathF.PI, (Vector2)pathPoint.Point);
+            // Now offset to our target point since we're aligning the top-left location of our glyph against the path.
+            Vector2 translation = (Vector2)pathPoint.Point - bounds.Location - half + new Vector2(0, bounds.Top);
+            Matrix3x2 matrix = Matrix3x2.CreateTranslation(translation) * Matrix3x2.CreateRotation(pathPoint.Angle - MathF.PI, (Vector2)pathPoint.Point);
 
             this.Builder.SetTransform(matrix);
         }