Skip to content

Commit c366de5

Browse files
JimBobSquarePantsJimBobSquarePants
committed
Rename canvas
1 parent 2b735f3 commit c366de5

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

‎src/SixLabors.Fonts/Rendering/IPaintedGlyphSource.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ internal interface IPaintedGlyphSource
1616
/// <param name="glyph">The painted glyph.</param>
1717
/// <param name="canvas">The canvas metadata.</param>
1818
/// <returns><see langword="true"/> if the glyph is available; otherwise <see langword="false"/>.</returns>
19-
public bool TryGetPaintedGlyph(ushort glyphId, out PaintedGlyph glyph, out PaintedCanvas canvas);
19+
public bool TryGetPaintedGlyph(ushort glyphId, out PaintedGlyph glyph, out PaintedCanvasMetadata canvas);
2020
}

src/SixLabors.Fonts/Rendering/PaintedCanvas.cs renamed to src/SixLabors.Fonts/Rendering/PaintedCanvasMetadata.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ namespace SixLabors.Fonts.Rendering;
88
/// <summary>
99
/// Canvas metadata describing the document-space coordinate system for a painted glyph.
1010
/// </summary>
11-
internal readonly struct PaintedCanvas
11+
internal readonly struct PaintedCanvasMetadata
1212
{
1313
/// <summary>
14-
/// Initializes a new instance of the <see cref="PaintedCanvas"/> struct.
14+
/// Initializes a new instance of the <see cref="PaintedCanvasMetadata"/> struct.
1515
/// </summary>
1616
/// <param name="viewBox">The viewBox rectangle (minX, minY, width, height).</param>
1717
/// <param name="isYDown">True if the source coordinate system is y-down; false if y-up.</param>
1818
/// <param name="rootTransform">An optional root transform in document-space.</param>
19-
public PaintedCanvas(FontRectangle viewBox, bool isYDown, Matrix3x2 rootTransform)
19+
public PaintedCanvasMetadata(FontRectangle viewBox, bool isYDown, Matrix3x2 rootTransform)
2020
{
2121
this.HasViewBox = viewBox != FontRectangle.Empty;
2222
this.ViewBox = viewBox;

‎src/SixLabors.Fonts/Rendering/PaintedGlyphMetrics.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ internal override void RenderTo(
147147
if (renderer.BeginGlyph(in box, in parameters))
148148
{
149149
if (!UnicodeUtility.ShouldRenderWhiteSpaceOnly(this.CodePoint)
150-
&& this.source.TryGetPaintedGlyph(this.GlyphId, out PaintedGlyph glyph, out PaintedCanvas canvas))
150+
&& this.source.TryGetPaintedGlyph(this.GlyphId, out PaintedGlyph glyph, out PaintedCanvasMetadata canvas))
151151
{
152152
// Source-to-UPEM: viewBox mapping (uniform "meet"), optional y-flip, optional root transform.
153153
Matrix3x2 s2u = ComputeSourceToUpem(canvas, this.UnitsPerEm);
@@ -169,7 +169,7 @@ internal override void RenderTo(
169169
/// Enforces a uniform 'meet' scale from the root viewBox (if present) and flips Y
170170
/// only if the source is y-up.
171171
/// </summary>
172-
private static Matrix3x2 ComputeSourceToUpem(in PaintedCanvas canvas, ushort upem)
172+
private static Matrix3x2 ComputeSourceToUpem(in PaintedCanvasMetadata canvas, ushort upem)
173173
{
174174
Matrix3x2 m = Matrix3x2.Identity;
175175

‎src/SixLabors.Fonts/Tables/General/Colr/ColrGlyphSourceBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public ColrGlyphSourceBase(ColrTable colr, CpalTable? cpal, Func<ushort, GlyphVe
4242
protected Func<ushort, GlyphVector?> GlyphLoader { get; }
4343

4444
/// <inheritdoc/>
45-
public abstract bool TryGetPaintedGlyph(ushort glyphId, out PaintedGlyph glyph, out PaintedCanvas canvas);
45+
public abstract bool TryGetPaintedGlyph(ushort glyphId, out PaintedGlyph glyph, out PaintedCanvasMetadata canvas);
4646

4747
/// <summary>
4848
/// Recursively flattens a COLR paint graph:

‎src/SixLabors.Fonts/Tables/General/Colr/ColrV0GlyphSource.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ namespace SixLabors.Fonts.Tables.General.Colr;
1010

1111
/// <summary>
1212
/// Supplies painted glyphs for COLR v0 fonts.
13-
/// Flattens paint graphs into a linear <see cref="PaintedLayer"/> stream and emits a <see cref="PaintedCanvas"/>.
13+
/// Flattens paint graphs into a linear <see cref="PaintedLayer"/> stream and emits a <see cref="PaintedCanvasMetadata"/>.
1414
/// </summary>
1515
internal sealed class ColrV0GlyphSource : ColrGlyphSourceBase
1616
{
17-
private static readonly ConcurrentDictionary<ushort, (PaintedGlyph Glyph, PaintedCanvas Canvas)> CachedGlyphs = [];
17+
private static readonly ConcurrentDictionary<ushort, (PaintedGlyph Glyph, PaintedCanvasMetadata Canvas)> CachedGlyphs = [];
1818

1919
/// <summary>
2020
/// Initializes a new instance of the <see cref="ColrV0GlyphSource"/> class.
@@ -28,9 +28,9 @@ public ColrV0GlyphSource(ColrTable colr, CpalTable? cpal, Func<ushort, GlyphVect
2828
}
2929

3030
/// <inheritdoc/>
31-
public override bool TryGetPaintedGlyph(ushort glyphId, out PaintedGlyph glyph, out PaintedCanvas canvas)
31+
public override bool TryGetPaintedGlyph(ushort glyphId, out PaintedGlyph glyph, out PaintedCanvasMetadata canvas)
3232
{
33-
(PaintedGlyph Glyph, PaintedCanvas Canvas) result = CachedGlyphs.GetOrAdd(glyphId, id =>
33+
(PaintedGlyph Glyph, PaintedCanvasMetadata Canvas) result = CachedGlyphs.GetOrAdd(glyphId, id =>
3434
{
3535
if (this.Colr.TryGetColrV0Layers(id, out Span<LayerRecord> resolved))
3636
{
@@ -65,7 +65,7 @@ public override bool TryGetPaintedGlyph(ushort glyphId, out PaintedGlyph glyph,
6565
{
6666
// Canvas viewBox in Y-up; renderer downstream decides orientation via flag.
6767
PaintedGlyph glyph = new(layers);
68-
PaintedCanvas canvas = new(FontRectangle.Empty, isYDown: false, rootTransform: Matrix3x2.Identity);
68+
PaintedCanvasMetadata canvas = new(FontRectangle.Empty, isYDown: false, rootTransform: Matrix3x2.Identity);
6969
return (glyph, canvas);
7070
}
7171
}

‎src/SixLabors.Fonts/Tables/General/Colr/ColrV1GlyphSource.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ namespace SixLabors.Fonts.Tables.General.Colr;
1010

1111
/// <summary>
1212
/// Supplies painted glyphs for COLR v1 fonts.
13-
/// Flattens paint graphs into a linear <see cref="PaintedLayer"/> stream and emits a <see cref="PaintedCanvas"/>.
13+
/// Flattens paint graphs into a linear <see cref="PaintedLayer"/> stream and emits a <see cref="PaintedCanvasMetadata"/>.
1414
/// </summary>
1515
internal sealed class ColrV1GlyphSource : ColrGlyphSourceBase
1616
{
17-
private static readonly ConcurrentDictionary<ushort, (PaintedGlyph Glyph, PaintedCanvas Canvas)> CachedGlyphs = [];
17+
private static readonly ConcurrentDictionary<ushort, (PaintedGlyph Glyph, PaintedCanvasMetadata Canvas)> CachedGlyphs = [];
1818

1919
/// <summary>
2020
/// Initializes a new instance of the <see cref="ColrV1GlyphSource"/> class.
@@ -28,9 +28,9 @@ public ColrV1GlyphSource(ColrTable colr, CpalTable? cpal, Func<ushort, GlyphVect
2828
}
2929

3030
/// <inheritdoc/>
31-
public override bool TryGetPaintedGlyph(ushort glyphId, out PaintedGlyph glyph, out PaintedCanvas canvas)
31+
public override bool TryGetPaintedGlyph(ushort glyphId, out PaintedGlyph glyph, out PaintedCanvasMetadata canvas)
3232
{
33-
(PaintedGlyph Glyph, PaintedCanvas Canvas) result = CachedGlyphs.GetOrAdd(glyphId, _ =>
33+
(PaintedGlyph Glyph, PaintedCanvasMetadata Canvas) result = CachedGlyphs.GetOrAdd(glyphId, _ =>
3434
{
3535
if (this.Colr.TryGetColrV1Layers(glyphId, out List<ResolvedGlyphLayer>? resolved))
3636
{
@@ -74,7 +74,7 @@ public override bool TryGetPaintedGlyph(ushort glyphId, out PaintedGlyph glyph,
7474
{
7575
// Canvas viewBox in Y-up; renderer downstream decides orientation via flag.
7676
PaintedGlyph glyph = new(layers);
77-
PaintedCanvas canvas = new(FontRectangle.Empty, isYDown: false, rootTransform: Matrix3x2.Identity);
77+
PaintedCanvasMetadata canvas = new(FontRectangle.Empty, isYDown: false, rootTransform: Matrix3x2.Identity);
7878
return (glyph, canvas);
7979
}
8080
}

‎src/SixLabors.Fonts/Tables/General/Svg/SvgGlyphSource.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal sealed class SvgGlyphSource : IPaintedGlyphSource
2222
{
2323
private readonly SvgTable svgTable;
2424
private static readonly Dictionary<ushort, ParsedDoc> DocCache = [];
25-
private static readonly ConcurrentDictionary<ushort, (PaintedGlyph Glyph, PaintedCanvas Canvas)> CachedGlyphs = [];
25+
private static readonly ConcurrentDictionary<ushort, (PaintedGlyph Glyph, PaintedCanvasMetadata Canvas)> CachedGlyphs = [];
2626

2727
private sealed class ParsedDoc
2828
{
@@ -38,9 +38,9 @@ private sealed class ParsedDoc
3838
public SvgGlyphSource(SvgTable svgTable) => this.svgTable = svgTable;
3939

4040
/// <inheritdoc/>
41-
public bool TryGetPaintedGlyph(ushort glyphId, out PaintedGlyph glyph, out PaintedCanvas canvas)
41+
public bool TryGetPaintedGlyph(ushort glyphId, out PaintedGlyph glyph, out PaintedCanvasMetadata canvas)
4242
{
43-
(PaintedGlyph Glyph, PaintedCanvas Canvas) result = CachedGlyphs.GetOrAdd(glyphId, gid =>
43+
(PaintedGlyph Glyph, PaintedCanvasMetadata Canvas) result = CachedGlyphs.GetOrAdd(glyphId, gid =>
4444
{
4545
if (this.TryGetParsedDoc(gid, out ParsedDoc? parsed))
4646
{
@@ -65,7 +65,7 @@ public bool TryGetPaintedGlyph(ushort glyphId, out PaintedGlyph glyph, out Paint
6565
if (layers.Count > 0)
6666
{
6767
PaintedGlyph glyph = new(layers);
68-
PaintedCanvas canvas = new(viewBox, true, rootTransform);
68+
PaintedCanvasMetadata canvas = new(viewBox, true, rootTransform);
6969
return (glyph, canvas);
7070
}
7171
}

0 commit comments

Comments
 (0)