lsm/PdfPig
1
0
Fork 0
mirror of https://github.com/UglyToad/PdfPig.git synced 2026-03-10 00:23:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make CrossReferenceTableParser a static class

Browse Source
This commit is contained in:
Inusual
2020-02-24 00:37:10 -04:00
committed by Eliot Jones
parent b7a86f482f
commit 013cbd14e0
4 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/UglyToad.PdfPig.Tests/Parser/Parts/FileStructure/CrossReferenceTableParserTests.cs
View File

@@ -10,8 +10,6 @@
public class CrossReferenceTableParserTests
{
private readonly CrossReferenceTableParser parser = new CrossReferenceTableParser();
[Fact]
public void ParseNewDefaultTable()
{
@@ -27,7 +25,7 @@
trailer
<< >>");
var result = parser.Parse(input, 4, false);
var result = CrossReferenceTableParser.Parse(input, 4, false);
Assert.Equal(4, result.ObjectOffsets.Count);
}
@@ -37,7 +35,7 @@ trailer
{
var input = GetReader("12 0 obj <<>> endobj xref");
Action action = () => parser.Parse(input, 4, false);
Action action = () => CrossReferenceTableParser.Parse(input, 4, false);
Assert.Throws<PdfDocumentFormatException>(action);
}
@@ -48,7 +46,7 @@ trailer
var input = GetReader(@"xtable
trailer");
Action action = () => parser.Parse(input, 0, false);
Action action = () => CrossReferenceTableParser.Parse(input, 0, false);
Assert.Throws<PdfDocumentFormatException>(action);
}
@@ -60,7 +58,7 @@ trailer");
trailer
<<>>");
var result = parser.Parse(input, 0, false);
var result = CrossReferenceTableParser.Parse(input, 0, false);
Assert.Empty(result.ObjectOffsets);
}
@@ -73,7 +71,7 @@ ab 12
trailer
<<>>");
var result = parser.Parse(input, 0, true);
var result = CrossReferenceTableParser.Parse(input, 0, true);
Assert.Empty(result.ObjectOffsets);
}
@@ -86,7 +84,7 @@ ab 12
trailer
<<>>");
Action action = () => parser.Parse(input, 0, false);
Action action = () => CrossReferenceTableParser.Parse(input, 0, false);
Assert.Throws<PdfDocumentFormatException>(action);
}
@@ -100,7 +98,7 @@ trailer
trailer
<<>>");
var result = parser.Parse(input, 0, false);
var result = CrossReferenceTableParser.Parse(input, 0, false);
Assert.Empty(result.ObjectOffsets);
Assert.Equal(0, result.Offset);
@@ -118,7 +116,7 @@ trailer
trailer
<<>>");
var result = parser.Parse(input, 0, false);
var result = CrossReferenceTableParser.Parse(input, 0, false);
Assert.Equal(2, result.ObjectOffsets.Count);
@@ -143,7 +141,7 @@ trailer
trailer
<<>>");
var result = parser.Parse(input, 0, false);
var result = CrossReferenceTableParser.Parse(input, 0, false);
Assert.Equal(2, result.ObjectOffsets.Count);
@@ -169,7 +167,7 @@ trailer
trailer
<<>>");
var result = parser.Parse(input, 0, false);
var result = CrossReferenceTableParser.Parse(input, 0, false);
Assert.Equal(2, result.ObjectOffsets.Count);
@@ -199,7 +197,7 @@ trailer
trailer
<<>>");
var result = parser.Parse(input, 0, false);
var result = CrossReferenceTableParser.Parse(input, 0, false);
Assert.Equal(5, result.ObjectOffsets.Count);
@@ -236,7 +234,7 @@ trailer
trailer
<<>>");
var result = parser.Parse(input, 0, false);
Action action = () => CrossReferenceTableParser.Parse(input, 0, false);
var offset = Assert.Single(result.ObjectOffsets);
Assert.Equal(10, offset.Value);
@@ -252,7 +250,7 @@ trailer
trailer
<<>>");
Action action = () => parser.Parse(input, 0, false);
Action action = () => CrossReferenceTableParser.Parse(input, 0, false);
Assert.Throws<PdfDocumentFormatException>(action);
}
@@ -267,7 +265,7 @@ trailer
trailer
<<>>");
Action action = () => parser.Parse(input, 0, false);
Action action = () => CrossReferenceTableParser.Parse(input, 0, false);
Assert.Throws<PdfDocumentFormatException>(action);
}
@@ -283,7 +281,7 @@ trailer
trailer
<<>>");
var result = parser.Parse(input, 0, false);
var result = CrossReferenceTableParser.Parse(input, 0, false);
Assert.Equal(2, result.ObjectOffsets.Count);
}

7
src/UglyToad.PdfPig/Parser/FileStructure/CrossReferenceParser.cs
View File

@@ -15,18 +15,15 @@
private readonly ILog log;
private readonly XrefOffsetValidator offsetValidator;
private readonly CrossReferenceStreamParser crossReferenceStreamParser;
private readonly CrossReferenceTableParser crossReferenceTableParser;
private readonly XrefCosOffsetChecker xrefCosChecker;
public CrossReferenceParser(ILog log, XrefOffsetValidator offsetValidator,
XrefCosOffsetChecker xrefCosChecker,
CrossReferenceStreamParser crossReferenceStreamParser,
CrossReferenceTableParser crossReferenceTableParser)
CrossReferenceStreamParser crossReferenceStreamParser)
{
this.log = log;
this.offsetValidator = offsetValidator;
this.crossReferenceStreamParser = crossReferenceStreamParser;
this.crossReferenceTableParser = crossReferenceTableParser;
this.xrefCosChecker = xrefCosChecker;
}
@@ -70,7 +67,7 @@
missedAttempts = 0;
log.Debug("Element was cross reference table.");
CrossReferenceTablePart tablePart = crossReferenceTableParser.Parse(tokenScanner,
CrossReferenceTablePart tablePart = CrossReferenceTableParser.Parse(tokenScanner,
previousCrossReferenceLocation, isLenientParsing);
var nextOffset = tablePart.GetPreviousOffset();

4
src/UglyToad.PdfPig/Parser/FileStructure/CrossReferenceTableParser.cs
View File

@@ -9,12 +9,12 @@
using Tokenization.Scanner;
using Tokens;
internal class CrossReferenceTableParser
internal static class CrossReferenceTableParser
{
private const string InUseEntry = "n";
private const string FreeEntry = "f";
public CrossReferenceTablePart Parse(ISeekableTokenScanner scanner, long offset, bool isLenientParsing)
public static CrossReferenceTablePart Parse(ISeekableTokenScanner scanner, long offset, bool isLenientParsing)
{
var builder = new CrossReferenceTablePartBuilder
{

2
src/UglyToad.PdfPig/Parser/PdfDocumentFactory.cs
View File

@@ -94,7 +94,7 @@
var pdfScanner = new PdfTokenScanner(inputBytes, locationProvider, filterProvider, NoOpEncryptionHandler.Instance);
var crossReferenceStreamParser = new CrossReferenceStreamParser(filterProvider);
var crossReferenceParser = new CrossReferenceParser(log, xrefValidator, objectChecker, crossReferenceStreamParser, new CrossReferenceTableParser());
var crossReferenceParser = new CrossReferenceParser(log, xrefValidator, objectChecker, crossReferenceStreamParser);
var version = FileHeaderParser.Parse(scanner, isLenientParsing, log);