lsm/PdfPig
1
0
Fork 0
mirror of https://github.com/UglyToad/PdfPig.git synced 2025-12-21 11:13:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

allow stream filters to contain indirect references to name tokens

Browse Source
This commit is contained in:
Eliot Jones
2021-04-25 16:22:22 -04:00
parent c74ca5fda8
commit 9ae0a5ec15
25 changed files with 239 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/UglyToad.PdfPig.Tests/TestFilterProvider.cs
View File

@@ -2,9 +2,10 @@
{
using System.Collections.Generic;
using PdfPig.Filters;
using PdfPig.Tokenization.Scanner;
using PdfPig.Tokens;
internal class TestFilterProvider : IFilterProvider
internal class TestFilterProvider : ILookupFilterProvider
{
public IReadOnlyList<IFilter> GetFilters(DictionaryToken dictionary)
{
@@ -20,5 +21,10 @@
{
return new List<IFilter>();
}
public IReadOnlyList<IFilter> GetFilters(DictionaryToken dictionary, IPdfTokenScanner scanner)
{
return new List<IFilter>();
}
}
}

76
src/UglyToad.PdfPig.Tests/Tokenization/Scanner/PdfTokenScannerTests.cs
View File

@@ -15,7 +15,9 @@
[Fact]
public void ReadsSimpleObject()
{
const string s = @"294 0 obj
const string s = @"294 0 obj
/WDKAAR+CMBX12
endobj";
var pdfScanner = GetScanner(s);
@@ -116,7 +118,15 @@ endobj
[Fact]
public void ReadsArrayObject()
{
public void ReadsArrayObject()
const string s = @"
endobj
295 0 obj
[
676 938 875 787 750 880 813 875 813 875 813 656 625 625 938 938 313
344 563 563 563 563 563 850 500 574 813 875 563 1019 1144 875 313
]
endobj";
var pdfScanner = GetScanner(s);
@@ -143,8 +153,29 @@ endobj
{
const string s = @"
Assert.StartsWith("295 0 obj", s.Substring((int)obj.Position));
274 0 obj
<<
/Type /Pages
/Count 2
/Parent 275 0 R
/Kids [ 121 0 R 125 0 R ]
>>
endobj
%Other parts...
310 0 obj
/WPXNWT+CMR9
endobj 311 0 obj
<<
/Type /Font
/Subtype /Type1
/FirstChar 0
/LastChar 127
/Widths 313 0 R
/BaseFont 310 0 R /FontDescriptor 312 0 R
>>
endobj";
var scanner = GetScanner(s);
@@ -191,11 +222,16 @@ endobj
public void ReadsStreamObject()
{
const string s = @"
Assert.StartsWith("310 0 obj", s.Substring((int)tokens[1].Position));
352 0 obj
<< /S 1273 /Filter /FlateDecode /Length 353 0 R >>
stream
H‰œUkLSgþÚh¹IÝÅlK(%[ÈÅ©+ ƒåê©ŠèæÇtnZ)Z¹¨Oå~9ŠÊµo”[éiK)÷B¹´
É² ©¸˜ n±º×dKöcÏ÷ãœç{ßï}¾÷ÍÉs  Ô;€
Assert.Equal(7, dictionary.Data.Count);
À»—ÀF`ÇF@ƒ 4 ˜ï @¥T¨³fY: žw̵;’’Îq®]cƒÿdp¨ÛI3F#G©#œ)TÇqW£NÚѬgOKbü‡µ#á¡£Þaîtƒƒ›ß–
¾“S>}µuÕõ5M±¢ª†»øÞû•q÷îÜ~¬PòžÞ~•¬ëɃGÅ-Ñ­ím·°gêêb,/,£P§õ^ v¾ãÁô¿¿ŠTE]²±{šuwÔ`LG³DªìTÈ
A¡¬àð‰É©ˆ°‘¼›‚%¥×s³®í»š}%§X{{tøNåÝž¶ö¢ÖÞ¾–~´¼¬°À“Éððr¥8»P£ØêÁi½®Û(éhŽ‘ú;x#dÃÄ$m
+)
)†…±n
9ùyŽA·n\ï»t!=3£½¡:®­µåâ¹Ô³ø¼ËiûSÎsë;•Dt—ö$WÉ4U‘¢ºÚšñá1íÐèÔó‚svõ(/(+D²#mZÏ6êüÝ7x‡—†”‡E„²‚|ê«êªDµ5q°šR¦RÈ£ n¾[è~“}ýƒÝ½SꞦ'æQŽzÝ‚mæ
óF+Õ%ù‡ƒß9SˆŒÓãšH¶~L-#T]êîÁ©ÎkbjÒp½¸$¤´(4<,""øfvΕ< VЍ«#4'2l'Ð1ñðn?sìûãI'OŸøñçŸN5(äÊ'âÎѾÞþíðƒQmu}]Õ£‡c›©.Œòµ9zz0Ѳ‚B¢«#š-3ªà<cš¥’¡È¨qµ¦{pìۄÇŽŠ/íO»|áIclSCuo_Oœ\\ï!ª©«­ªƒTþ5Ó‹™Ü”óî_9|ýÍ7ø!Ñý|2Goÿ€Î¶Öö…<ðáƒGéGá½G´Ã.®TŠóî=_|þ™‡ƒééFwßà 0æîc_Ó릳|ý|¶®æ„…†G8Òüï€l…\¦RFº:‰ VP𕐝S“Û¶ï V—ø/¿¾Xæ+«««ÖŽ4>ŸŸ¦Pà8®Ó…¼æ¢BaÅÐkëÊŠukÈÊÖL£­ivvv…k2=µZMØ|Úl(ŠZ­V›ÍbI>Ÿl¹œ(â±Äb­ø”Uª ñeü©U*‹’“Oð,„E+¶Êà>ŽU”ÎÌõçlºFÃ_ÃÙl?¶=>>!>þC¿-×à©©©x¾€¢ŠÊåòtÃ0‹Æôz“‰ NÊ,¬‚kÀ°F‚XÛ4&“ÉfÃñÅæûæy=ÆãIðE _¾Èårår/XÞ„/·qò›m¶ìÖ|†óx8Wð¹hºÜÂÕalÎü’˜Ã0^Òòòü¼yÞ¶´´DX
)¨ÇM8lüM…Oúý| 1Ïãk»:t<…ÂÚl¶e¾†” éKÜl6c¹¸É„› ”)‰'3¤œ\–™ËN–™ÿe^Ё² y÷ð¹f`3ëž´ ¸“$d:e†)!%2ºdvË@½N¼ªŠ Ùná¹ ¼¿@ €Ã.èšs ì÷ûM€2(E4_ | FÑ.@v@÷¤ÃÅ0È Pž~,€:»H¤k¾ hT Œ € êÇV:Ô…©@@oH¯(3T‰{""C½SñŠœþtz3€•ƒ ñf.¬SЍøzWþ*$9gj=~Ì·QD E6o¥Ûi/Â`1ígGMq,;}Ž¼sÔ×®kDü˜J{e5‚²ìɐ~Y)}fA>:˜ù–""Yò ç¹=ù²yÛ¡¿i aœ‘ØϺþÇoäO ôkÆ)
@@ -339,7 +375,31 @@ endobj";
[Fact]
public void ReadsStringsWithMissingEndBracket()
{
const string input = @"5 0 obj
<<
/Kids [4 0 R 12 0 R 17 0 R 20 0 R 25 0 R 28 0 R ]
/Count 6
/Type /Pages
/MediaBox [ 0 0 612 792 ]
>>
endobj
1 0 obj
<<
/Creator (Corel WordPerfect - [D:\Wpdocs\WEBSITE\PROC&POL.WP6 (unmodified)
/CreationDate (D:19980224130723)
/Title (Proc&Pol.pdf)
/Author (J. L. Swezey)
/Producer (Acrobat PDFWriter 3.03 for Windows NT)
/Keywords (Budapest Treaty; Patent deposits; IDA)
/Subject (Patent Collection Procedures and Policies)
>>
endobj
3 0 obj
<<
/Pages 5 0 R
/Type /Catalog
>>
endobj";
var scanner = GetScanner(input);

6
src/UglyToad.PdfPig.sln.DotSettings
View File

@@ -9,4 +9,8 @@
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RGB/@EntryIndexedValue">RGB</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XY/@EntryIndexedValue">XY</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String></wpf:ResourceDictionary>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

7
src/UglyToad.PdfPig/AcroForms/AcroFormFactory.cs
View File

@@ -6,7 +6,6 @@
using Content;
using Core;
using CrossReference;
using Exceptions;
using Fields;
using Filters;
using Parser.Parts;
@@ -30,10 +29,10 @@
};
private readonly IPdfTokenScanner tokenScanner;
private readonly IFilterProvider filterProvider;
private readonly ILookupFilterProvider filterProvider;
private readonly CrossReferenceTable crossReferenceTable;
public AcroFormFactory(IPdfTokenScanner tokenScanner, IFilterProvider filterProvider, CrossReferenceTable crossReferenceTable)
public AcroFormFactory(IPdfTokenScanner tokenScanner, ILookupFilterProvider filterProvider, CrossReferenceTable crossReferenceTable)
{
this.tokenScanner = tokenScanner ?? throw new ArgumentNullException(nameof(tokenScanner));
this.filterProvider = filterProvider ?? throw new ArgumentNullException(nameof(filterProvider));
@@ -314,7 +313,7 @@
}
else if (DirectObjectFinder.TryGet(textValueToken, tokenScanner, out StreamToken valueStreamToken))
{
textValue = OtherEncodings.BytesAsLatin1String(valueStreamToken.Decode(filterProvider).ToArray());
textValue = OtherEncodings.BytesAsLatin1String(valueStreamToken.Decode(filterProvider, tokenScanner).ToArray());
}
}

6
src/UglyToad.PdfPig/AdvancedPdfDocumentAccess.cs
View File

@@ -16,13 +16,13 @@
public class AdvancedPdfDocumentAccess : IDisposable
{
private readonly IPdfTokenScanner pdfScanner;
private readonly IFilterProvider filterProvider;
private readonly ILookupFilterProvider filterProvider;
private readonly Catalog catalog;
private bool isDisposed;
internal AdvancedPdfDocumentAccess(IPdfTokenScanner pdfScanner,
IFilterProvider filterProvider,
ILookupFilterProvider filterProvider,
Catalog catalog)
{
this.pdfScanner = pdfScanner ?? throw new ArgumentNullException(nameof(pdfScanner));
@@ -73,7 +73,7 @@
fileSpecification = fileSpecificationToken.Data;
}
var fileBytes = fileStreamToken.Decode(filterProvider);
var fileBytes = fileStreamToken.Decode(filterProvider, pdfScanner);
result.Add(new EmbeddedFile(keyValuePair.Key, fileSpecification, fileBytes, fileStreamToken));
}

4
src/UglyToad.PdfPig/Content/PageContent.cs
View File

@@ -21,7 +21,7 @@
private readonly IReadOnlyList<Union<XObjectContentRecord, InlineImage>> images;
private readonly IReadOnlyList<MarkedContentElement> markedContents;
private readonly IPdfTokenScanner pdfScanner;
private readonly IFilterProvider filterProvider;
private readonly ILookupFilterProvider filterProvider;
private readonly IResourceStore resourceStore;
internal IReadOnlyList<IGraphicsStateOperation> GraphicsStateOperations { get; }
@@ -37,7 +37,7 @@
IReadOnlyList<Union<XObjectContentRecord, InlineImage>> images,
IReadOnlyList<MarkedContentElement> markedContents,
IPdfTokenScanner pdfScanner,
IFilterProvider filterProvider,
ILookupFilterProvider filterProvider,
IResourceStore resourceStore)
{
GraphicsStateOperations = graphicsStateOperations;

9
src/UglyToad.PdfPig/Content/XmpMetadata.cs
View File

@@ -6,6 +6,7 @@
using System.Xml.Linq;
using Core;
using Filters;
using Tokenization.Scanner;
using Tokens;
using Util.JetBrains.Annotations;
@@ -15,7 +16,8 @@
/// </summary>
public class XmpMetadata
{
private readonly IFilterProvider filterProvider;
private readonly ILookupFilterProvider filterProvider;
private readonly IPdfTokenScanner pdfTokenScanner;
/// <summary>
/// The underlying <see cref="StreamToken"/> for this metadata.
@@ -23,9 +25,10 @@
[NotNull]
public StreamToken MetadataStreamToken { get; }
internal XmpMetadata(StreamToken stream, IFilterProvider filterProvider)
internal XmpMetadata(StreamToken stream, ILookupFilterProvider filterProvider, IPdfTokenScanner pdfTokenScanner)
{
this.filterProvider = filterProvider ?? throw new ArgumentNullException(nameof(filterProvider));
this.pdfTokenScanner = pdfTokenScanner;
MetadataStreamToken = stream ?? throw new ArgumentNullException(nameof(stream));
}
@@ -35,7 +38,7 @@
/// <returns>The bytes for the metadata object with any filters removed.</returns>
public IReadOnlyList<byte> GetXmlBytes()
{
return MetadataStreamToken.Decode(filterProvider);
return MetadataStreamToken.Decode(filterProvider, pdfTokenScanner);
}
/// <summary>

1
src/UglyToad.PdfPig/Filters/DefaultFilterProvider.cs
View File

@@ -117,5 +117,6 @@
{
return filterInstances.Values.Distinct().ToList();
}
}
}

73
src/UglyToad.PdfPig/Filters/FilterProviderWithLookup.cs Normal file
View File

@@ -0,0 +1,73 @@
namespace UglyToad.PdfPig.Filters
{
using System;
using System.Collections.Generic;
using System.Linq;
using Core;
using Parser.Parts;
using Tokenization.Scanner;
using Tokens;
internal class FilterProviderWithLookup : ILookupFilterProvider
{
private readonly IFilterProvider inner;
public FilterProviderWithLookup(IFilterProvider inner)
{
this.inner = inner;
}
public IReadOnlyList<IFilter> GetFilters(DictionaryToken dictionary)
=> inner.GetFilters(dictionary);
public IReadOnlyList<IFilter> GetNamedFilters(IReadOnlyList<NameToken> names)
=> inner.GetNamedFilters(names);
public IReadOnlyList<IFilter> GetAllFilters()
=> inner.GetAllFilters();
public IReadOnlyList<IFilter> GetFilters(DictionaryToken dictionary, IPdfTokenScanner scanner)
{
if (dictionary == null)
{
throw new ArgumentNullException(nameof(dictionary));
}
if (!dictionary.TryGet(NameToken.Filter, out var token))
{
return EmptyArray<IFilter>.Instance;
}
switch (token)
{
case ArrayToken filters:
var result = new NameToken[filters.Data.Count];
for (var i = 0; i < filters.Data.Count; i++)
{
var filterToken = filters.Data[i];
var filterName = (NameToken)filterToken;
result[i] = filterName;
}
return GetNamedFilters(result);
case NameToken name:
return GetNamedFilters(new[] {name});
case IndirectReferenceToken irt:
if (DirectObjectFinder.TryGet<NameToken>(irt, scanner, out var indirectName))
{
return GetNamedFilters(new []{ indirectName });
}
else if (DirectObjectFinder.TryGet<ArrayToken>(irt, scanner, out var indirectArray))
{
return GetNamedFilters(indirectArray.Data.Select(x => (NameToken) x).ToList());
}
else
{
throw new PdfDocumentFormatException($"The filter for the stream was not a valid object. Expected name or array, instead got: {token}.");
}
default:
throw new PdfDocumentFormatException($"The filter for the stream was not a valid object. Expected name or array, instead got: {token}.");
}
}
}
}

6
src/UglyToad.PdfPig/Filters/IFilterProvider.cs
View File

@@ -1,6 +1,7 @@
namespace UglyToad.PdfPig.Filters
{
using System.Collections.Generic;
using Tokenization.Scanner;
using Tokens;
/// <summary>
@@ -23,4 +24,9 @@
/// </summary>
IReadOnlyList<IFilter> GetAllFilters();
}
internal interface ILookupFilterProvider : IFilterProvider
{
IReadOnlyList<IFilter> GetFilters(DictionaryToken dictionary, IPdfTokenScanner scanner);
}
}

8
src/UglyToad.PdfPig/Graphics/ContentStreamProcessor.cs
View File

@@ -16,7 +16,7 @@
using System.Linq;
using Tokenization.Scanner;
using Tokens;
using UglyToad.PdfPig.Graphics.Operations.TextPositioning;
using Operations.TextPositioning;
using XObjects;
using static PdfPig.Core.PdfSubpath;
@@ -47,7 +47,7 @@
private readonly PageRotationDegrees rotation;
private readonly IPdfTokenScanner pdfScanner;
private readonly IPageContentParser pageContentParser;
private readonly IFilterProvider filterProvider;
private readonly ILookupFilterProvider filterProvider;
private readonly ILog log;
private readonly bool clipPaths;
private readonly PdfVector pageSize;
@@ -88,7 +88,7 @@
public ContentStreamProcessor(PdfRectangle cropBox, IResourceStore resourceStore, UserSpaceUnit userSpaceUnit, PageRotationDegrees rotation,
IPdfTokenScanner pdfScanner,
IPageContentParser pageContentParser,
IFilterProvider filterProvider,
ILookupFilterProvider filterProvider,
ILog log,
bool clipPaths,
PdfVector pageSize)
@@ -448,7 +448,7 @@
startState.CurrentTransformationMatrix = resultingTransformationMatrix;
var contentStream = formStream.Decode(filterProvider);
var contentStream = formStream.Decode(filterProvider, pdfScanner);
var operations = pageContentParser.Parse(pageNumber, new ByteArrayInputBytes(contentStream), log);

4
src/UglyToad.PdfPig/Graphics/InlineImageBuilder.cs
View File

@@ -18,7 +18,7 @@
public IReadOnlyList<byte> Bytes { get; set; }
public InlineImage CreateInlineImage(TransformationMatrix transformationMatrix, IFilterProvider filterProvider,
public InlineImage CreateInlineImage(TransformationMatrix transformationMatrix, ILookupFilterProvider filterProvider,
IPdfTokenScanner tokenScanner,
RenderingIntent defaultRenderingIntent,
IResourceStore resourceStore)
@@ -28,8 +28,6 @@
throw new InvalidOperationException($"Inline image builder not completely defined before calling {nameof(CreateInlineImage)}.");
}
var bounds = transformationMatrix.Transform(new PdfRectangle(new PdfPoint(1, 1),
new PdfPoint(0, 0)));

2
src/UglyToad.PdfPig/Graphics/MarkedContentStack.cs
View File

@@ -69,7 +69,7 @@
public void AddXObject(XObjectContentRecord xObject,
IPdfTokenScanner scanner,
IFilterProvider filterProvider,
ILookupFilterProvider filterProvider,
IResourceStore resourceStore)
{
if (top != null && xObject.Type == XObjectType.Image)

8
src/UglyToad.PdfPig/Parser/PageFactory.cs
View File

@@ -19,11 +19,11 @@
{
private readonly IPdfTokenScanner pdfScanner;
private readonly IResourceStore resourceStore;
private readonly IFilterProvider filterProvider;
private readonly ILookupFilterProvider filterProvider;
private readonly IPageContentParser pageContentParser;
private readonly ILog log;
public PageFactory(IPdfTokenScanner pdfScanner, IResourceStore resourceStore, IFilterProvider filterProvider,
public PageFactory(IPdfTokenScanner pdfScanner, IResourceStore resourceStore, ILookupFilterProvider filterProvider,
IPageContentParser pageContentParser,
ILog log)
{
@@ -122,7 +122,7 @@
throw new InvalidOperationException($"Could not find the contents for object {obj}.");
}
bytes.AddRange(contentStream.Decode(filterProvider));
bytes.AddRange(contentStream.Decode(filterProvider, pdfScanner));
if (i < array.Data.Count - 1)
{
@@ -141,7 +141,7 @@
throw new InvalidOperationException("Failed to parse the content for the page: " + number);
}
var bytes = contentStream.Decode(filterProvider);
var bytes = contentStream.Decode(filterProvider, pdfScanner);
content = GetContent(number, bytes, cropBox, userSpaceUnit, rotation, clipPaths, mediaBox);
}

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

@@ -83,7 +83,7 @@
private static PdfDocument OpenDocument(IInputBytes inputBytes, ISeekableTokenScanner scanner, ILog log, bool isLenientParsing,
IReadOnlyList<string> passwords, bool clipPaths)
{
var filterProvider = DefaultFilterProvider.Instance;
var filterProvider = new FilterProviderWithLookup(DefaultFilterProvider.Instance);
CrossReferenceTable crossReferenceTable = null;

12
src/UglyToad.PdfPig/PdfDocument.cs
View File

@@ -44,7 +44,7 @@
[NotNull]
private readonly IPdfTokenScanner pdfScanner;
private readonly IFilterProvider filterProvider;
private readonly ILookupFilterProvider filterProvider;
private readonly BookmarksProvider bookmarksProvider;
[NotNull]
@@ -92,7 +92,7 @@
DocumentInformation information,
EncryptionDictionary encryptionDictionary,
IPdfTokenScanner pdfScanner,
IFilterProvider filterProvider,
ILookupFilterProvider filterProvider,
AcroFormFactory acroFormFactory,
BookmarksProvider bookmarksProvider,
bool clipPaths)
@@ -202,7 +202,7 @@
return false;
}
metadata = new XmpMetadata(xmpStreamToken, filterProvider);
metadata = new XmpMetadata(xmpStreamToken, filterProvider, pdfScanner);
return true;
}
@@ -219,7 +219,11 @@
}
bookmarks = bookmarksProvider.GetBookmarks(Structure.Catalog);
if (bookmarks != null) return true;
if (bookmarks != null)
{
return true;
}
return false;
}

13
src/UglyToad.PdfPig/PdfExtensions.cs
View File

@@ -62,5 +62,18 @@
return transform;
}
internal static IReadOnlyList<byte> Decode(this StreamToken stream, ILookupFilterProvider filterProvider, IPdfTokenScanner scanner)
{
var filters = filterProvider.GetFilters(stream.StreamDictionary, scanner);
var transform = stream.Data;
for (var i = 0; i < filters.Count; i++)
{
transform = filters[i].Decode(transform, stream.StreamDictionary, i);
}
return transform;
}
}
}

8
src/UglyToad.PdfPig/PdfFonts/Parser/Handlers/TrueTypeFontHandler.cs
View File

@@ -25,12 +25,12 @@
{
private readonly ILog log;
private readonly IPdfTokenScanner pdfScanner;
private readonly IFilterProvider filterProvider;
private readonly ILookupFilterProvider filterProvider;
private readonly IEncodingReader encodingReader;
private readonly ISystemFontFinder systemFontFinder;
private readonly IFontHandler type1FontHandler;
public TrueTypeFontHandler(ILog log, IPdfTokenScanner pdfScanner, IFilterProvider filterProvider,
public TrueTypeFontHandler(ILog log, IPdfTokenScanner pdfScanner, ILookupFilterProvider filterProvider,
IEncodingReader encodingReader,
ISystemFontFinder systemFontFinder,
IFontHandler type1FontHandler)
@@ -109,7 +109,7 @@
{
var toUnicode = DirectObjectFinder.Get<StreamToken>(toUnicodeObj, pdfScanner);
var decodedUnicodeCMap = toUnicode.Decode(filterProvider);
var decodedUnicodeCMap = toUnicode.Decode(filterProvider, pdfScanner);
if (decodedUnicodeCMap != null)
{
@@ -173,7 +173,7 @@
{
var fontFileStream = DirectObjectFinder.Get<StreamToken>(descriptor.FontFile.ObjectKey, pdfScanner);
var fontFile = fontFileStream.Decode(filterProvider);
var fontFile = fontFileStream.Decode(filterProvider, pdfScanner);
if (descriptor.FontFile.FileType == DescriptorFontFile.FontFileType.FromSubtype)
{

8
src/UglyToad.PdfPig/PdfFonts/Parser/Handlers/Type0FontHandler.cs
View File

@@ -16,10 +16,10 @@
internal class Type0FontHandler : IFontHandler
{
private readonly CidFontFactory cidFontFactory;
private readonly IFilterProvider filterProvider;
private readonly ILookupFilterProvider filterProvider;
private readonly IPdfTokenScanner scanner;
public Type0FontHandler(CidFontFactory cidFontFactory, IFilterProvider filterProvider,
public Type0FontHandler(CidFontFactory cidFontFactory, ILookupFilterProvider filterProvider,
IPdfTokenScanner scanner)
{
this.cidFontFactory = cidFontFactory;
@@ -66,7 +66,7 @@
if (DirectObjectFinder.TryGet<StreamToken>(toUnicodeValue, scanner, out var toUnicodeStream))
{
var decodedUnicodeCMap = toUnicodeStream?.Decode(filterProvider);
var decodedUnicodeCMap = toUnicodeStream?.Decode(filterProvider, scanner);
if (decodedUnicodeCMap != null)
{
@@ -155,7 +155,7 @@
}
else if (dictionary.TryGet(NameToken.Encoding, scanner, out StreamToken stream))
{
var decoded = stream.Decode(filterProvider);
var decoded = stream.Decode(filterProvider, scanner);
var cmap = CMapCache.Parse(new ByteArrayInputBytes(decoded));

8
src/UglyToad.PdfPig/PdfFonts/Parser/Handlers/Type1FontHandler.cs
View File

@@ -17,10 +17,10 @@
internal class Type1FontHandler : IFontHandler
{
private readonly IPdfTokenScanner pdfScanner;
private readonly IFilterProvider filterProvider;
private readonly ILookupFilterProvider filterProvider;
private readonly IEncodingReader encodingReader;
public Type1FontHandler(IPdfTokenScanner pdfScanner, IFilterProvider filterProvider,
public Type1FontHandler(IPdfTokenScanner pdfScanner, ILookupFilterProvider filterProvider,
IEncodingReader encodingReader)
{
this.pdfScanner = pdfScanner;
@@ -92,7 +92,7 @@
{
var toUnicode = DirectObjectFinder.Get<StreamToken>(toUnicodeObj, pdfScanner);
var decodedUnicodeCMap = toUnicode?.Decode(filterProvider);
var decodedUnicodeCMap = toUnicode?.Decode(filterProvider, pdfScanner);
if (decodedUnicodeCMap != null)
{
@@ -143,7 +143,7 @@
return null;
}
var bytes = stream.Decode(filterProvider);
var bytes = stream.Decode(filterProvider, pdfScanner);
// We have a Compact Font Format font rather than an Adobe Type 1 Font.
if (stream.StreamDictionary.TryGet(NameToken.Subtype, out NameToken subTypeName)

6
src/UglyToad.PdfPig/PdfFonts/Parser/Handlers/Type3FontHandler.cs
View File

@@ -13,11 +13,11 @@
internal class Type3FontHandler : IFontHandler
{
private readonly IFilterProvider filterProvider;
private readonly ILookupFilterProvider filterProvider;
private readonly IEncodingReader encodingReader;
private readonly IPdfTokenScanner scanner;
public Type3FontHandler(IPdfTokenScanner scanner, IFilterProvider filterProvider,
public Type3FontHandler(IPdfTokenScanner scanner, ILookupFilterProvider filterProvider,
IEncodingReader encodingReader)
{
this.filterProvider = filterProvider;
@@ -42,7 +42,7 @@
{
var toUnicode = DirectObjectFinder.Get<StreamToken>(toUnicodeObj, scanner);
var decodedUnicodeCMap = toUnicode?.Decode(filterProvider);
var decodedUnicodeCMap = toUnicode?.Decode(filterProvider, scanner);
if (decodedUnicodeCMap != null)
{

12
src/UglyToad.PdfPig/PdfFonts/Parser/Parts/CidFontFactory.cs
View File

@@ -17,10 +17,10 @@
internal class CidFontFactory
{
private readonly IFilterProvider filterProvider;
private readonly ILookupFilterProvider filterProvider;
private readonly IPdfTokenScanner pdfScanner;
public CidFontFactory(IPdfTokenScanner pdfScanner, IFilterProvider filterProvider)
public CidFontFactory(IPdfTokenScanner pdfScanner, ILookupFilterProvider filterProvider)
{
this.pdfScanner = pdfScanner;
this.filterProvider = filterProvider;
@@ -109,7 +109,7 @@
return null;
}
var fontFile = fontFileStream.Decode(filterProvider);
var fontFile = fontFileStream.Decode(filterProvider, pdfScanner);
switch (descriptor.FontFile.FileType)
{
@@ -134,14 +134,14 @@
if (subtypeName == NameToken.CidFontType0C
|| subtypeName == NameToken.Type1C)
{
var bytes = str.Decode(filterProvider);
var bytes = str.Decode(filterProvider, pdfScanner);
var font = CompactFontFormatParser.Parse(new CompactFontFormatData(bytes));
return new PdfCidCompactFontFormatFont(font);
}
if (subtypeName == NameToken.OpenType)
{
var bytes = str.Decode(filterProvider);
var bytes = str.Decode(filterProvider, pdfScanner);
var ttf = TrueTypeFontParser.Parse(new TrueTypeDataBytes(new ByteArrayInputBytes(bytes)));
return new PdfCidTrueTypeFont(ttf);
}
@@ -301,7 +301,7 @@
throw new PdfDocumentFormatException($"No stream or name token found for /CIDToGIDMap in dictionary: {dictionary}.");
}
var bytes = stream.Decode(filterProvider);
var bytes = stream.Decode(filterProvider, pdfScanner);
return new CharacterIdentifierToGlyphIndexMap(bytes);
}

6
src/UglyToad.PdfPig/Tokenization/Scanner/PdfTokenScanner.cs
View File

@@ -22,7 +22,7 @@
private readonly IInputBytes inputBytes;
private readonly IObjectLocationProvider objectLocationProvider;
private readonly IFilterProvider filterProvider;
private readonly ILookupFilterProvider filterProvider;
private readonly CoreTokenScanner coreTokenScanner;
private IEncryptionHandler encryptionHandler;
@@ -50,7 +50,7 @@
public long Length => coreTokenScanner.Length;
public PdfTokenScanner(IInputBytes inputBytes, IObjectLocationProvider objectLocationProvider, IFilterProvider filterProvider,
public PdfTokenScanner(IInputBytes inputBytes, IObjectLocationProvider objectLocationProvider, ILookupFilterProvider filterProvider,
IEncryptionHandler encryptionHandler)
{
this.inputBytes = inputBytes;
@@ -794,7 +794,7 @@
}
// Read the N integers
var bytes = new ByteArrayInputBytes(stream.Decode(filterProvider));
var bytes = new ByteArrayInputBytes(stream.Decode(filterProvider, this));
var scanner = new CoreTokenScanner(bytes);

4
src/UglyToad.PdfPig/Util/ColorSpaceDetailsParser.cs
View File

@@ -71,7 +71,7 @@
DictionaryToken imageDictionary,
IPdfTokenScanner scanner,
IResourceStore resourceStore,
IFilterProvider filterProvider,
ILookupFilterProvider filterProvider,
bool cannotRecurse = false)
{
if (!colorSpace.HasValue)
@@ -179,7 +179,7 @@
}
else if (DirectObjectFinder.TryGet(fourth, scanner, out StreamToken tableStreamToken))
{
tableBytes = tableStreamToken.Decode(filterProvider);
tableBytes = tableStreamToken.Decode(filterProvider, scanner);
}
else
{

7
src/UglyToad.PdfPig/XObjects/XObjectFactory.cs
View File

@@ -9,7 +9,6 @@
using Graphics;
using Graphics.Colors;
using Graphics.Core;
using Parser.Parts;
using Tokenization.Scanner;
using Tokens;
using Util;
@@ -17,7 +16,7 @@
internal static class XObjectFactory
{
public static XObjectImage ReadImage(XObjectContentRecord xObject, IPdfTokenScanner pdfScanner,
IFilterProvider filterProvider,
ILookupFilterProvider filterProvider,
IResourceStore resourceStore)
{
if (xObject == null)
@@ -89,7 +88,7 @@
var supportsFilters = filterDictionary != null;
if (filterDictionary != null)
{
var filters = filterProvider.GetFilters(filterDictionary);
var filters = filterProvider.GetFilters(filterDictionary, pdfScanner);
foreach (var filter in filters)
{
if (!filter.IsSupported)
@@ -100,7 +99,7 @@
}
}
var decodedBytes = supportsFilters ? new Lazy<IReadOnlyList<byte>>(() => xObject.Stream.Decode(filterProvider))
var decodedBytes = supportsFilters ? new Lazy<IReadOnlyList<byte>>(() => xObject.Stream.Decode(filterProvider, pdfScanner))
: null;
var decode = EmptyArray<decimal>.Instance;