Merge branch 'main' into bp/cff2

Author: JimBobSquarePants

.github/ISSUE_TEMPLATE/oss-bug-report.md .github/ISSUE_TEMPLATE/oss-bug-report.yml.github/ISSUE_TEMPLATE/oss-bug-report.md renamed to .github/ISSUE_TEMPLATE/oss-bug-report.yml

@@ -155,7 +155,9 @@ jobs:
         if: failure()
         with:
           name: actual_output_${{ runner.os }}_${{ matrix.options.framework }}${{ matrix.options.runtime }}.zip
-          path: tests/Images/ActualOutput/
+          path: |
+              tests/Images/ActualOutput/
+              **/msbuild.binlog
 
       - name: Codecov Update
         uses: codecov/codecov-action@v4

.github/workflows/build-and-test.yml

@@ -254,6 +254,8 @@ paket-files/
 *.sln.iml
 /samples/DrawWithImageSharp/Output
 
+# Tests
+**/Images/ActualOutput
 /tests/CodeCoverage/OpenCover.*
 SixLabors.Shapes.Coverage.xml
 /SixLabors.Fonts.Coverage.xml

.gitignore

@@ -50,7 +50,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{EC0F1812-C6AF-48D8-882B-5637730D2DB1}"
 	ProjectSection(SolutionItems) = preProject
 		.github\ISSUE_TEMPLATE\config.yml = .github\ISSUE_TEMPLATE\config.yml
-		.github\ISSUE_TEMPLATE\oss-bug-report.md = .github\ISSUE_TEMPLATE\oss-bug-report.md
+		.github\ISSUE_TEMPLATE\oss-bug-report.yml = .github\ISSUE_TEMPLATE\oss-bug-report.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{CFCC940C-DEA3-42CC-9626-0B7D09289FF4}"

SixLabors.Fonts.sln

@@ -8,4 +8,4 @@ dotnet clean -c Release
 $repositoryUrl = "https://github.com/$env:GITHUB_REPOSITORY"
 
 # Building for a specific framework.
-dotnet build -c Release -f $targetFramework /p:RepositoryUrl=$repositoryUrl
+dotnet build -c Release -f $targetFramework /p:RepositoryUrl=$repositoryUrl -bl

ci-build.ps1

@@ -46,7 +46,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.0.1" />
+    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.4" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 

samples/DrawWithImageSharp/DrawWithImageSharp.csproj

@@ -12,7 +12,7 @@ namespace SixLabors.Fonts;
 /// BinaryReader using big-endian encoding.
 /// </summary>
 [DebuggerDisplay("Start: {StartOfStream}, Position: {BaseStream.Position}")]
-internal class BigEndianBinaryReader : IDisposable
+internal sealed class BigEndianBinaryReader : IDisposable
 {
     /// <summary>
     /// Buffer used for temporary storage before conversion into primitives

src/SixLabors.Fonts/BigEndianBinaryReader.cs

@@ -26,7 +26,7 @@ public Buffer(int length)
         this.buffer = ArrayPool<byte>.Shared.Rent(bufferSizeInBytes);
         this.length = length;
 
-        ByteMemoryManager<T> manager = new(this.buffer);
+        using ByteMemoryManager<T> manager = new(this.buffer);
         this.Memory = manager.Memory.Slice(0, this.length);
         this.span = this.Memory.Span;
 

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

@@ -108,6 +108,10 @@ internal override bool TryGetGlyphId(
         out bool skipNextCodePoint)
         => this.fontMetrics.Value.TryGetGlyphId(codePoint, nextCodePoint, out glyphId, out skipNextCodePoint);
 
+    /// <inheritdoc/>
+    internal override bool TryGetCodePoint(ushort glyphId, out CodePoint codePoint)
+        => this.fontMetrics.Value.TryGetCodePoint(glyphId, out codePoint);
+
     /// <inheritdoc/>
     internal override bool TryGetGlyphClass(ushort glyphId, [NotNullWhen(true)] out GlyphClassDef? glyphClass)
         => this.fontMetrics.Value.TryGetGlyphClass(glyphId, out glyphClass);
@@ -153,8 +157,8 @@ internal override void ApplySubstitution(GlyphSubstitutionCollection collection)
         => this.fontMetrics.Value.ApplySubstitution(collection);
 
     /// <inheritdoc/>
-    internal override bool TryGetKerningOffset(ushort previousId, ushort currentId, out Vector2 vector)
-        => this.fontMetrics.Value.TryGetKerningOffset(previousId, currentId, out vector);
+    internal override bool TryGetKerningOffset(ushort currentId, ushort nextId, out Vector2 vector)
+        => this.fontMetrics.Value.TryGetKerningOffset(currentId, nextId, out vector);
 
     /// <inheritdoc/>
     internal override void UpdatePositions(GlyphPositioningCollection collection)
@@ -169,7 +173,7 @@ public static FileFontMetrics[] LoadFontCollection(string path)
     {
         using FileStream fs = File.OpenRead(path);
         long startPos = fs.Position;
-        BigEndianBinaryReader reader = new(fs, true);
+        using BigEndianBinaryReader reader = new(fs, true);
         TtcHeader ttcHeader = TtcHeader.Read(reader);
         FileFontMetrics[] fonts = new FileFontMetrics[(int)ttcHeader.NumFonts];
 

src/SixLabors.Fonts/FileFontMetrics.cs

@@ -253,11 +253,11 @@ public bool TryGetGlyphs(
     }
 
     /// <summary>
-    /// Gets the amount, in px units, the <paramref name="current"/> glyph should be offset if it is proceeded by
-    /// the <paramref name="previous"/> glyph.
+    /// Gets the amount, in px units, the <paramref name="current"/> glyph should be offset if it is followed by
+    /// the <paramref name="next"/> glyph.
     /// </summary>
-    /// <param name="previous">The previous glyph.</param>
     /// <param name="current">The current glyph.</param>
+    /// <param name="next">The next glyph.</param>
     /// <param name="dpi">The DPI (Dots Per Inch) to render/measure the kerning offset at.</param>
     /// <param name="vector">
     /// When this method returns, contains the offset, in font units, that should be applied to the
@@ -267,12 +267,12 @@ public bool TryGetGlyphs(
     /// <returns>
     /// <see langword="true"/> if the face contains and offset for the glyph combination; otherwise, <see langword="false"/>.
     /// </returns>
-    public bool TryGetKerningOffset(Glyph previous, Glyph current, float dpi, out Vector2 vector)
+    public bool TryGetKerningOffset(Glyph current, Glyph next, float dpi, out Vector2 vector)
     {
-        if (this.FontMetrics.TryGetKerningOffset(previous.GlyphMetrics.GlyphId, current.GlyphMetrics.GlyphId, out vector))
+        if (this.FontMetrics.TryGetKerningOffset(current.GlyphMetrics.GlyphId, next.GlyphMetrics.GlyphId, out vector))
         {
             // Scale the result
-            Vector2 scale = new Vector2(this.Size * dpi) / current.GlyphMetrics.ScaleFactor;
+            Vector2 scale = new Vector2(this.Size * dpi) / next.GlyphMetrics.ScaleFactor;
             vector *= scale;
             return true;
         }
@@ -290,7 +290,7 @@ private string LoadFontName()
             return metrics;
         }
 
-        if (this.RequestedStyle.HasFlag(FontStyle.Italic))
+        if ((this.RequestedStyle & FontStyle.Italic) == FontStyle.Italic)
         {
             // Can't find style requested and they want one that's at least partial italic.
             // Try the regular italic.
@@ -300,7 +300,7 @@ private string LoadFontName()
             }
         }
 
-        if (this.RequestedStyle.HasFlag(FontStyle.Bold))
+        if ((this.RequestedStyle & FontStyle.Bold) == FontStyle.Bold)
         {
             // Can't find style requested and they want one that's at least partial bold.
             // Try the regular bold.