lsm/PdfPig
1
0
Fork 0
mirror of https://github.com/UglyToad/PdfPig.git synced 2025-10-15 19:54:52 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

#63 make cache of parsed system fonts static and read the whole file up-front rather than using a filestream

Browse Source
This commit is contained in:
Eliot Jones
2019-08-19 20:09:07 +01:00
parent 0fa3b27ad3
commit e0a32a701b
1 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/UglyToad.PdfPig/Fonts/SystemFonts/SystemFontFinder.cs
View File

@@ -14,6 +14,9 @@
{
private static readonly IReadOnlyDictionary<string, string[]> NameSubstitutes;
private static readonly object CacheLock = new object();
private static readonly Dictionary<string, TrueTypeFontProgram> Cache = new Dictionary<string, TrueTypeFontProgram>(StringComparer.OrdinalIgnoreCase);
static SystemFontFinder()
{
var dict = new Dictionary<string, string[]>
@@ -67,7 +70,6 @@
private readonly TrueTypeFontParser trueTypeFontParser;
private readonly Lazy<IReadOnlyList<SystemFontRecord>> availableFonts;
private readonly Dictionary<string, TrueTypeFontProgram> cache = new Dictionary<string, TrueTypeFontProgram>(StringComparer.OrdinalIgnoreCase);
private readonly Dictionary<string, string> nameToFileNameMap = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
private readonly HashSet<string> readFiles = new HashSet<string>();
@@ -157,14 +159,17 @@
private TrueTypeFontProgram GetTrueTypeFontNamed(string name)
{
if (cache.TryGetValue(name, out var result))
lock (CacheLock)
{
return result;
if (Cache.TryGetValue(name, out var cachedResult))
{
return cachedResult;
}
}
if (nameToFileNameMap.TryGetValue(name, out var fileName))
{
if (TryReadFile(fileName, false, name, out result))
if (TryReadFile(fileName, false, name, out var result))
{
return result;
}
@@ -216,40 +221,42 @@
font = null;
readFiles.Add(fileName);
using (var fileStream = File.OpenRead(fileName))
var bytes = File.ReadAllBytes(fileName);
var data = new TrueTypeDataBytes(new ByteArrayInputBytes(bytes));
if (readNameFirst)
{
var input = new StreamInputBytes(fileStream);
var data = new TrueTypeDataBytes(input);
var name = trueTypeFontParser.GetNameTable(data);
if (readNameFirst)
if (name == null)
{
var name = trueTypeFontParser.GetNameTable(data);
if (name == null)
{
return false;
}
var fontNameFromFile = name.GetPostscriptName() ?? name.FontName;
nameToFileNameMap[fontNameFromFile] = fileName;
if (!string.Equals(fontNameFromFile, fontName, StringComparison.OrdinalIgnoreCase))
{
return false;
}
return false;
}
data.Seek(0);
font = trueTypeFontParser.Parse(data);
var psName = font.TableRegister.NameTable?.GetPostscriptName() ?? font.Name;
if (!cache.ContainsKey(psName))
{
cache[psName] = font;
}
var fontNameFromFile = name.GetPostscriptName() ?? name.FontName;
return true;
nameToFileNameMap[fontNameFromFile] = fileName;
if (!string.Equals(fontNameFromFile, fontName, StringComparison.OrdinalIgnoreCase))
{
return false;
}
}
data.Seek(0);
font = trueTypeFontParser.Parse(data);
var psName = font.TableRegister.NameTable?.GetPostscriptName() ?? font.Name;
lock (CacheLock)
{
if (!Cache.ContainsKey(psName))
{
Cache[psName] = font;
}
}
return true;
}
}
}