Merge pull request #379 from SixLabors/js/fix-378

Prevent key collision in glyphmetrics cache.

src/SixLabors.Fonts/ArrayBuilder{T}.cs

@@ -22,14 +22,13 @@ internal struct ArrayBuilder<T>
     /// <summary>
     /// Initializes a new instance of the <see cref="ArrayBuilder{T}"/> struct.
     /// </summary>
-    /// <param name="capacity">The intitial capacity of the array.</param>
+    /// <param name="capacity">The initial capacity of the array.</param>
     public ArrayBuilder(int capacity)
         : this()
     {
         Guard.MustBeGreaterThanOrEqualTo(capacity, 0, nameof(capacity));
 
         this.data = new T[capacity];
-        this.size = capacity;
     }
 
     /// <summary>

src/SixLabors.Fonts/StreamFontMetrics.cs

@@ -29,8 +29,8 @@ internal partial class StreamFontMetrics : FontMetrics
     private readonly OutlineType outlineType;
 
     // https://docs.microsoft.com/en-us/typography/opentype/spec/otff#font-tables
-    private readonly ConcurrentDictionary<(ushort Id, TextAttributes Attributes, bool IsVerticalLayout), GlyphMetrics[]> glyphCache;
-    private readonly ConcurrentDictionary<(ushort Id, TextAttributes Attributes, bool IsVerticalLayout), GlyphMetrics[]>? colorGlyphCache;
+    private readonly ConcurrentDictionary<(int CodePoint, ushort Id, TextAttributes Attributes, bool IsVerticalLayout), GlyphMetrics[]> glyphCache;
+    private readonly ConcurrentDictionary<(int CodePoint, ushort Id, TextAttributes Attributes, bool IsVerticalLayout), GlyphMetrics[]>? colorGlyphCache;
     private readonly FontDescription description;
     private readonly HorizontalMetrics horizontalMetrics;
     private readonly VerticalMetrics verticalMetrics;
@@ -529,12 +529,12 @@ public static StreamFontMetrics[] LoadFontCollection(Stream stream)
         return fonts;
     }
 
-    private static (ushort Id, TextAttributes Attributes, bool IsVerticalLayout) CreateCacheKey(
+    private static (int CodePoint, ushort Id, TextAttributes Attributes, bool IsVerticalLayout) CreateCacheKey(
         CodePoint codePoint,
         ushort glyphId,
         TextAttributes textAttributes,
         LayoutMode layoutMode)
-        => (glyphId, textAttributes, AdvancedTypographicUtils.IsVerticalGlyph(codePoint, layoutMode));
+        => (codePoint.Value, glyphId, textAttributes, AdvancedTypographicUtils.IsVerticalGlyph(codePoint, layoutMode));
 
     private bool TryGetColoredMetrics(
         CodePoint codePoint,

tests/SixLabors.Fonts.Tests/Issues/Issues_378.cs

@@ -0,0 +1,19 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+namespace SixLabors.Fonts.Tests.Issues;
+public class Issues_378
+{
+    [Fact]
+    public void DoesNotBreakIncorrectly()
+    {
+        Font font = new FontCollection().Add(TestFonts.PlantinStdRegularFile).CreateFont(2048);
+
+        TextOptions options = new(font) { WrappingLength = float.MaxValue };
+        FontRectangle size = TextMeasurer.MeasureSize("D\r\nD", options);
+
+        FontRectangle size2 = TextMeasurer.MeasureSize("D D", options);
+
+        Assert.NotEqual(size, size2);
+    }
+}

tests/SixLabors.Fonts.Tests/TestFonts.cs

@@ -247,6 +247,8 @@ public static class TestFonts
 
     public static string BNazaninFile => GetFullPath("BNazanin.ttf");
 
+    public static string PlantinStdRegularFile => GetFullPath("PlantinStdRegular.otf");
+
     public static Stream TwemojiMozillaData() => OpenStream(TwemojiMozillaFile);
 
     public static Stream SegoeuiEmojiData() => OpenStream(SegoeuiEmojiFile);