Skip to content

Do not use default GlyphVector #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JimBobSquarePants merged 2 commits into from
Nov 26, 2025
Merged

Do not use default GlyphVector #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b81ba43
Fix #480
JimBobSquarePants Nov 26, 2025
ae2544b
Delete Issues_480.cs
JimBobSquarePants Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/SixLabors.Fonts/Tables/TrueType/Glyphs/CompositeGlyphLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ internal sealed class CompositeGlyphLoader : GlyphLoader

public CompositeGlyphLoader(IEnumerable<Composite> composites, Bounds bounds, ReadOnlyMemory<byte> instructions)
{
this.composites = composites.ToArray();
this.composites = [.. composites];
this.bounds = bounds;
this.instructions = instructions;
}

public override GlyphVector CreateGlyph(GlyphTable table)
{
List<ControlPoint> controlPoints = new();
List<ushort> endPoints = new();
List<ControlPoint> controlPoints = [];
List<ushort> endPoints = [];
for (int i = 0; i < this.composites.Length; i++)
{
Composite composite = this.composites[i];
var clone = GlyphVector.DeepClone(table.GetGlyph(composite.GlyphIndex));
GlyphVector clone = GlyphVector.DeepClone(table.GetGlyph(composite.GlyphIndex));
GlyphVector.TransformInPlace(ref clone, composite.Transformation);
ushort endPointOffset = (ushort)controlPoints.Count;

Expand All @@ -41,7 +41,7 @@ public override GlyphVector CreateGlyph(GlyphTable table)

public static CompositeGlyphLoader LoadCompositeGlyph(BigEndianBinaryReader reader, in Bounds bounds)
{
List<Composite> composites = new();
List<Composite> composites = [];
CompositeGlyphFlags flags;
do
{
Expand Down Expand Up @@ -76,7 +76,7 @@ public static CompositeGlyphLoader LoadCompositeGlyph(BigEndianBinaryReader read
}
while ((flags & CompositeGlyphFlags.MoreComponents) != 0);

byte[] instructions = Array.Empty<byte>();
byte[] instructions = [];
if ((flags & CompositeGlyphFlags.WeHaveInstructions) != 0)
{
// Read the instructions if they exist.
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Fonts/Tables/TrueType/Glyphs/GlyphTable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ internal virtual GlyphVector GetGlyph(int index)
{
if (index < 0 || index >= this.loaders.Length)
{
return default;
return GlyphVector.Empty();
}

return this.glyphCache.GetOrAdd(index, i => this.loaders[i].CreateGlyph(this));
Expand Down
14 changes: 7 additions & 7 deletions src/SixLabors.Fonts/Tables/TrueType/Glyphs/GlyphVector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ public static void Hint(
return;
}

var controlPoints = new ControlPoint[glyph.ControlPoints.Count + 4];
controlPoints[controlPoints.Length - 4].Point = pp1;
controlPoints[controlPoints.Length - 3].Point = pp2;
controlPoints[controlPoints.Length - 2].Point = pp3;
controlPoints[controlPoints.Length - 1].Point = pp4;
ControlPoint[] controlPoints = new ControlPoint[glyph.ControlPoints.Count + 4];
controlPoints[^4].Point = pp1;
controlPoints[^3].Point = pp2;
controlPoints[^2].Point = pp3;
controlPoints[^1].Point = pp4;

for (int i = 0; i < glyph.ControlPoints.Count; i++)
{
Expand All @@ -107,8 +107,8 @@ public static void Hint(
/// <returns>The cloned <see cref="GlyphVector"/>.</returns>
public static GlyphVector DeepClone(GlyphVector src)
{
List<ControlPoint> controlPoints = new(src.ControlPoints);
List<ushort> endPoints = new(src.EndPoints);
List<ControlPoint> controlPoints = [.. src.ControlPoints];
List<ushort> endPoints = [.. src.EndPoints];

return new(controlPoints, endPoints, src.Bounds, src.Instructions, src.IsComposite);
}
Expand Down
Loading