Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 3 additions & 9 deletions src/UglyToad.PdfPig.Tests/Integration/GithubIssuesTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -472,19 +472,13 @@ public void Issue874()
{
var doc = IntegrationHelpers.GetDocumentPath("ErcotFacts.pdf");

using (var document = PdfDocument.Open(doc, new ParsingOptions() { UseLenientParsing = true, SkipMissingFonts = true }))
using (var document = PdfDocument.Open(doc, new ParsingOptions() { UseLenientParsing = true, SkipMissingFonts = false }))
{
var page1 = document.GetPage(1);
Assert.Equal(1788, page1.Letters.Count);
Assert.Equal(1939, page1.Letters.Count);

var page2 = document.GetPage(2);
Assert.Equal(2430, page2.Letters.Count);
}

using (var document = PdfDocument.Open(doc, new ParsingOptions() { UseLenientParsing = true, SkipMissingFonts = false }))
{
var ex = Assert.Throws<ArgumentNullException>(() => document.GetPage(1));
Assert.StartsWith("Value cannot be null.", ex.Message);
Assert.Equal(2434, page2.Letters.Count);
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/UglyToad.PdfPig/CrossReference/CrossReferenceTableBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ public CrossReferenceTable Build(long firstCrossReferenceOffset, long offsetCorr
// add this and follow chain defined by 'Prev' keys
xrefPartToBytePositionOrder.Add(firstCrossReferenceOffset);

// Get any streams that are tied to this table.
var activePart = currentPart;
var dependents = parts.Where(x => x.TiedToXrefAtOffset == activePart.Offset);
foreach (var dependent in dependents)
{
xrefPartToBytePositionOrder.Add(dependent.Offset);
}

while (currentPart.Dictionary != null)
{
// Get any streams that are tied to this table.
var activePart = currentPart;
var dependents = parts.Where(x => x.TiedToXrefAtOffset == activePart.Offset);
foreach (var dependent in dependents)
{
xrefPartToBytePositionOrder.Add(dependent.Offset);
}

long prevBytePos = currentPart.GetPreviousOffset();
if (prevBytePos == -1)
{
Expand Down
17 changes: 17 additions & 0 deletions src/UglyToad.PdfPig/Parser/FileStructure/FirstPassParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,23 @@ private static IReadOnlyList<IXrefSection> GetXrefPartsDirectly(
{
results.Add(table);
nextLocation = table.GetPrevious();

// Also add any optional associated Stream
var xRefStm = table.GetXRefStm();
if (xRefStm is long xRefStmValue)
{
var stream = GetXrefStreamOrTable(
offset,
input,
scanner,
xRefStmValue,
log);

if (stream != null)
{
results.Add(stream);
}
}
}
else if (streamOrTable is XrefStream stream)
{
Expand Down
10 changes: 10 additions & 0 deletions src/UglyToad.PdfPig/Parser/FileStructure/XrefTable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,14 @@ public XrefTable(

return null;
}

public long? GetXRefStm()
{
if (Dictionary != null && Dictionary.TryGet(NameToken.XrefStm, out NumericToken xRefStm))
{
return xRefStm.Long;
}

return null;
}
}
Loading