Use concurrent dictionary, fix namespace

JimBobSquarePants · JimBobSquarePants · commit d6b9eb373ccd · 2025-10-30T16:40:27.000+10:00
diff --git a/src/SixLabors.Fonts/StreamFontMetrics.Cff.cs b/src/SixLabors.Fonts/StreamFontMetrics.Cff.cs
@@ -9,7 +9,7 @@
 using SixLabors.Fonts.Tables.General.Kern;
 using SixLabors.Fonts.Tables.General.Name;
 using SixLabors.Fonts.Tables.General.Post;
-using SixLabors.Fonts.Tables.Svg;
+using SixLabors.Fonts.Tables.General.Svg;
 using SixLabors.Fonts.Unicode;
 
 namespace SixLabors.Fonts;
diff --git a/src/SixLabors.Fonts/StreamFontMetrics.TrueType.cs b/src/SixLabors.Fonts/StreamFontMetrics.TrueType.cs
@@ -9,7 +9,7 @@
 using SixLabors.Fonts.Tables.General.Kern;
 using SixLabors.Fonts.Tables.General.Name;
 using SixLabors.Fonts.Tables.General.Post;
-using SixLabors.Fonts.Tables.Svg;
+using SixLabors.Fonts.Tables.General.Svg;
 using SixLabors.Fonts.Tables.TrueType;
 using SixLabors.Fonts.Tables.TrueType.Glyphs;
 using SixLabors.Fonts.Tables.TrueType.Hinting;
diff --git a/src/SixLabors.Fonts/Tables/Cff/CompactFontTables.cs b/src/SixLabors.Fonts/Tables/Cff/CompactFontTables.cs
@@ -7,7 +7,7 @@
 using SixLabors.Fonts.Tables.General.Kern;
 using SixLabors.Fonts.Tables.General.Name;
 using SixLabors.Fonts.Tables.General.Post;
-using SixLabors.Fonts.Tables.Svg;
+using SixLabors.Fonts.Tables.General.Svg;
 
 namespace SixLabors.Fonts.Tables.Cff;
 
diff --git a/src/SixLabors.Fonts/Tables/General/Colr/ColrV0GlyphSource.cs b/src/SixLabors.Fonts/Tables/General/Colr/ColrV0GlyphSource.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using System.Collections.Concurrent;
 using System.Numerics;
 using SixLabors.Fonts.Rendering;
 using SixLabors.Fonts.Tables.TrueType.Glyphs;
@@ -13,7 +14,7 @@ namespace SixLabors.Fonts.Tables.General.Colr;
 /// </summary>
 internal sealed class ColrV0GlyphSource : ColrGlyphSourceBase
 {
-    private static readonly Dictionary<ushort, (PaintedGlyph Glyph, PaintedCanvas Canvas)> CachedGlyphs = [];
+    private static readonly ConcurrentDictionary<ushort, (PaintedGlyph Glyph, PaintedCanvas Canvas)> CachedGlyphs = [];
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ColrV0GlyphSource"/> class.
diff --git a/src/SixLabors.Fonts/Tables/General/Colr/ColrV1GlyphSource.cs b/src/SixLabors.Fonts/Tables/General/Colr/ColrV1GlyphSource.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using System.Collections.Concurrent;
 using System.Numerics;
 using SixLabors.Fonts.Rendering;
 using SixLabors.Fonts.Tables.TrueType.Glyphs;
@@ -13,7 +14,7 @@ namespace SixLabors.Fonts.Tables.General.Colr;
 /// </summary>
 internal sealed class ColrV1GlyphSource : ColrGlyphSourceBase
 {
-    private static readonly Dictionary<ushort, (PaintedGlyph Glyph, PaintedCanvas Canvas)> CachedGlyphs = [];
+    private static readonly ConcurrentDictionary<ushort, (PaintedGlyph Glyph, PaintedCanvas Canvas)> CachedGlyphs = [];
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ColrV1GlyphSource"/> class.
diff --git a/src/SixLabors.Fonts/Tables/General/Svg/SvgDocumentIndexEntry.cs b/src/SixLabors.Fonts/Tables/General/Svg/SvgDocumentIndexEntry.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.Fonts.Tables.Svg;
+namespace SixLabors.Fonts.Tables.General.Svg;
 
 internal readonly struct SvgDocumentIndexEntry
 {
diff --git a/src/SixLabors.Fonts/Tables/General/Svg/SvgGlyphSource.cs b/src/SixLabors.Fonts/Tables/General/Svg/SvgGlyphSource.cs
@@ -11,7 +11,7 @@
 using SixLabors.Fonts.Rendering;
 
 #pragma warning disable SA1201 // Elements should appear in the correct order
-namespace SixLabors.Fonts.Tables.Svg;
+namespace SixLabors.Fonts.Tables.General.Svg;
 
 /// <summary>
 /// Supplies painted glyphs (layers + commands + paints) and canvas metadata for OT-SVG glyphs.
@@ -21,8 +21,8 @@ namespace SixLabors.Fonts.Tables.Svg;
 internal sealed class SvgGlyphSource : IPaintedGlyphSource
 {
     private readonly SvgTable svgTable;
-    private static readonly Dictionary<ushort, ParsedDoc> DocCache = [];
-    private static readonly Dictionary<ushort, (PaintedGlyph Glyph, PaintedCanvas Canvas)> CachedGlyphs = [];
+    private static readonly ConcurrentDictionary<ushort, ParsedDoc> DocCache = [];
+    private static readonly ConcurrentDictionary<ushort, (PaintedGlyph Glyph, PaintedCanvas Canvas)> CachedGlyphs = [];
 
     private sealed class ParsedDoc
     {
diff --git a/src/SixLabors.Fonts/Tables/General/Svg/SvgTable.cs b/src/SixLabors.Fonts/Tables/General/Svg/SvgTable.cs
@@ -4,7 +4,7 @@
 using System.IO.Compression;
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.Fonts.Tables.Svg;
+namespace SixLabors.Fonts.Tables.General.Svg;
 
 internal class SvgTable : Table
 {
diff --git a/src/SixLabors.Fonts/Tables/TableLoader.cs b/src/SixLabors.Fonts/Tables/TableLoader.cs
@@ -8,7 +8,7 @@
 using SixLabors.Fonts.Tables.General.Kern;
 using SixLabors.Fonts.Tables.General.Name;
 using SixLabors.Fonts.Tables.General.Post;
-using SixLabors.Fonts.Tables.Svg;
+using SixLabors.Fonts.Tables.General.Svg;
 using SixLabors.Fonts.Tables.TrueType;
 using SixLabors.Fonts.Tables.TrueType.Glyphs;
 using SixLabors.Fonts.Tables.TrueType.Hinting;
diff --git a/src/SixLabors.Fonts/Tables/TrueType/Glyphs/GlyphTable.cs b/src/SixLabors.Fonts/Tables/TrueType/Glyphs/GlyphTable.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using System.Collections.Concurrent;
 using SixLabors.Fonts.Tables.Woff;
 
 namespace SixLabors.Fonts.Tables.TrueType.Glyphs;
@@ -9,12 +10,12 @@ internal class GlyphTable : Table
 {
     internal const string TableName = "glyf";
     private readonly GlyphLoader[] loaders;
-    private readonly Dictionary<int, GlyphVector> glyphCache;
+    private readonly ConcurrentDictionary<int, GlyphVector> glyphCache;
 
     public GlyphTable(GlyphLoader[] glyphLoaders)
     {
         this.loaders = glyphLoaders;
-        this.glyphCache = new(glyphLoaders.Length);
+        this.glyphCache = new(Environment.ProcessorCount, glyphLoaders.Length);
     }
 
     public int GlyphCount => this.loaders.Length;
diff --git a/src/SixLabors.Fonts/Tables/TrueType/TrueTypeFontTables.cs b/src/SixLabors.Fonts/Tables/TrueType/TrueTypeFontTables.cs
@@ -7,7 +7,7 @@
 using SixLabors.Fonts.Tables.General.Kern;
 using SixLabors.Fonts.Tables.General.Name;
 using SixLabors.Fonts.Tables.General.Post;
-using SixLabors.Fonts.Tables.Svg;
+using SixLabors.Fonts.Tables.General.Svg;
 using SixLabors.Fonts.Tables.TrueType.Glyphs;
 using SixLabors.Fonts.Tables.TrueType.Hinting;
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright (c) Six Labors.`
`2`	`2`	`// Licensed under the Six Labors Split License.`
`3`	`3`
`4`		`-namespace SixLabors.Fonts.Tables.Svg;`
	`4`	`+namespace SixLabors.Fonts.Tables.General.Svg;`
`5`	`5`
`6`	`6`	`internal readonly struct SvgDocumentIndexEntry`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.IO.Compression;`
`5`	`5`	`using System.Runtime.CompilerServices;`
`6`	`6`
`7`		`-namespace SixLabors.Fonts.Tables.Svg;`
	`7`	`+namespace SixLabors.Fonts.Tables.General.Svg;`
`8`	`8`
`9`	`9`	`internal class SvgTable : Table`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`// Copyright (c) Six Labors.`
`2`	`2`	`// Licensed under the Six Labors Split License.`
`3`	`3`
	`4`	`+using System.Collections.Concurrent;`
`4`	`5`	`using SixLabors.Fonts.Tables.Woff;`
`5`	`6`
`6`	`7`	`namespace SixLabors.Fonts.Tables.TrueType.Glyphs;`
`@@ -9,12 +10,12 @@ internal class GlyphTable : Table`
`9`	`10`	`{`
`10`	`11`	`internal const string TableName = "glyf";`
`11`	`12`	`private readonly GlyphLoader[] loaders;`
`12`		`- private readonly Dictionary<int, GlyphVector> glyphCache;`
	`13`	`+ private readonly ConcurrentDictionary<int, GlyphVector> glyphCache;`
`13`	`14`
`14`	`15`	`public GlyphTable(GlyphLoader[] glyphLoaders)`
`15`	`16`	`{`
`16`	`17`	`this.loaders = glyphLoaders;`
`17`		`- this.glyphCache = new(glyphLoaders.Length);`
	`18`	`+ this.glyphCache = new(Environment.ProcessorCount, glyphLoaders.Length);`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`public int GlyphCount => this.loaders.Length;`