From 912db0e8f4659c3b42e3096ad2424656e08cf16a Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Sat, 21 Mar 2026 20:04:39 +0100 Subject: [PATCH] Merge --- .../Media/Fonts/Tables/Cmap/CharacterToGlyphMap.cs | 1 + src/Avalonia.Base/Media/GlyphTypeface.cs | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Avalonia.Base/Media/Fonts/Tables/Cmap/CharacterToGlyphMap.cs b/src/Avalonia.Base/Media/Fonts/Tables/Cmap/CharacterToGlyphMap.cs index 973e99351a..bbf8fd1080 100644 --- a/src/Avalonia.Base/Media/Fonts/Tables/Cmap/CharacterToGlyphMap.cs +++ b/src/Avalonia.Base/Media/Fonts/Tables/Cmap/CharacterToGlyphMap.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Runtime.CompilerServices; namespace Avalonia.Media.Fonts.Tables.Cmap diff --git a/src/Avalonia.Base/Media/GlyphTypeface.cs b/src/Avalonia.Base/Media/GlyphTypeface.cs index 01fb3a8e1f..dccb45175f 100644 --- a/src/Avalonia.Base/Media/GlyphTypeface.cs +++ b/src/Avalonia.Base/Media/GlyphTypeface.cs @@ -95,6 +95,8 @@ namespace Avalonia.Media // Load COLR and CPAL tables for color glyph support ColrTable.TryLoad(this, out _colrTable); CpalTable.TryLoad(this, out _cpalTable); + + IsLastResort = ((headTable.Flags & HeadFlags.LastResortFont) != 0) || _cmapTable.Format == CmapFormat.Format13; } var ascent = 0; @@ -132,11 +134,6 @@ namespace Avalonia.Media } } - HeadTable.TryLoad(this, out var headTable); - - IsLastResort = (headTable is not null && (headTable.Flags & HeadFlags.LastResortFont) != 0) || - _cmapTable.Format == CmapFormat.Format13; - var postTable = PostTable.Load(this); var isFixedPitch = postTable.IsFixedPitch;