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

use direct object finder when getting the name of the base font in type 1 and truetype fonts.

Browse Source
This commit is contained in:
Eliot Jones
2018-01-13 20:06:58 +00:00
parent c88db947ad
commit 95ead2a3de
5 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/UglyToad.PdfPig.Tests/Integration/LocalTests.cs
View File

@@ -10,9 +10,9 @@
[Fact]
public void Tests()
{
//using (var document = PdfDocument.Open(@""))
using (var document = PdfDocument.Open(@"C:\Users\eliot\Downloads\ICML03-081.pdf"))
{
//var page = document.GetPage(1);
var page = document.GetPage(1);
}
}
}

10
src/UglyToad.PdfPig/Fonts/Parser/FontDictionaryAccessHelper.cs
View File

@@ -66,7 +66,7 @@
return descriptor;
}
public static CosName GetName(PdfDictionary dictionary, FontDescriptor descriptor)
public static CosName GetName(IPdfObjectParser pdfObjectParser, PdfDictionary dictionary, FontDescriptor descriptor, IRandomAccessRead reader, bool isLenientParsing)
{
if (dictionary.TryGetName(CosName.BASE_FONT, out CosName name))
{
@@ -78,6 +78,14 @@
return descriptor.FontName;
}
if (dictionary.TryGetValue(CosName.BASE_FONT, out var baseFont))
{
if (baseFont is CosObject baseFontObj)
{
return DirectObjectFinder.Find<CosName>(baseFontObj, pdfObjectParser, reader, isLenientParsing);
}
}
throw new InvalidFontFormatException($"Could not find a name for this font {dictionary}.");
}
}

5
src/UglyToad.PdfPig/Fonts/Parser/Handlers/TrueTypeFontHandler.cs
View File

@@ -46,9 +46,10 @@
var descriptor = FontDictionaryAccessHelper.GetFontDescriptor(pdfObjectParser, fontDescriptorFactory, dictionary, reader, isLenientParsing);
var font = ParseTrueTypeFont(descriptor, reader, isLenientParsing);
// TODO: use the parsed font fully.
//var font = ParseTrueTypeFont(descriptor, reader, isLenientParsing);
var name = FontDictionaryAccessHelper.GetName(dictionary, descriptor);
var name = FontDictionaryAccessHelper.GetName(pdfObjectParser, dictionary, descriptor, reader, isLenientParsing);
CMap toUnicodeCMap = null;
if (dictionary.TryGetItemOfType(CosName.TO_UNICODE, out CosObject toUnicodeObj))

2
src/UglyToad.PdfPig/Fonts/Parser/Handlers/Type1FontHandler.cs
View File

@@ -54,7 +54,7 @@
var descriptor = FontDictionaryAccessHelper.GetFontDescriptor(pdfObjectParser, fontDescriptorFactory, dictionary, reader, isLenientParsing);
var name = FontDictionaryAccessHelper.GetName(dictionary, descriptor);
var name = FontDictionaryAccessHelper.GetName(pdfObjectParser, dictionary, descriptor, reader, isLenientParsing);
CMap toUnicodeCMap = null;
if (dictionary.TryGetItemOfType(CosName.TO_UNICODE, out CosObject toUnicodeObj))

10
src/UglyToad.PdfPig/Fonts/Simple/Type1Font.cs
View File

@@ -53,6 +53,16 @@
if (encoding == null)
{
try
{
value = char.ConvertFromUtf32(characterCode);
return true;
}
catch
{
// our quick hack has failed, we should decode the type 1 font!
}
return false;
}