Skip to content

Fix TypeInitializationException when system has duplicate font names #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
punker76 wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −10
Open

Fix TypeInitializationException when system has duplicate font names #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Source/SVGImage/SVG/Utils/FontResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ public class FontResolver
public FontResolver(int maxLevenshteinDistance = 0)
{
_availableFonts = Fonts.SystemFontFamilies
.Select(ff => new { NormalName = ff.Source, Family = ff })
.ToDictionary(x => x.NormalName, x => x.Family, StringComparer.OrdinalIgnoreCase);
.GroupBy(ff => ff.Source, StringComparer.OrdinalIgnoreCase)
.ToDictionary(g => g.Key, g => g.First(), StringComparer.OrdinalIgnoreCase);

_normalizedFontNameMap = new Dictionary<string, string>(_availableFonts.Count);
foreach (var font in _availableFonts.Keys)
{
var name = Normalize(font);
if (!_normalizedFontNameMap.ContainsKey(name))
_normalizedFontNameMap.Add(name, font);
foreach (var font in _availableFonts.Keys)
{
var name = Normalize(font);
if (!_normalizedFontNameMap.ContainsKey(name))
_normalizedFontNameMap.Add(name, font);
}
MaxLevenshteinDistance = maxLevenshteinDistance;
}
Expand Down Expand Up @@ -157,7 +157,7 @@ private static string Normalize(string fontName)
return string.Empty;
}
return _normalizationRegex.Replace(fontName, String.Empty).ToLowerInvariant();

}

private static int[,] CreateDistanceMatrix(int length1, int length2)
Expand Down Expand Up @@ -201,7 +201,7 @@ private static int Levenshtein(string string1, string string2)
return string1.Length;
}


int[,] distanceMatrix = CreateDistanceMatrix(string1.Length, string2.Length);

for (int i = 1; i <= string1.Length; i++)
Expand All @@ -221,5 +221,5 @@ private static int Levenshtein(string string1, string string2)
}

}

}
Loading