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

fix missing change

Browse Source
This commit is contained in:
Plaisted
2021-02-10 20:56:51 -06:00
parent ef0bcd2055
commit 4b8925a442
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/UglyToad.PdfPig/Writer/PdfDocumentBuilder.cs
View File

@@ -327,9 +327,9 @@ namespace UglyToad.PdfPig.Writer
// copy content streams // copy content streams
var streams = new List<PdfPageBuilder.CopiedContentStream>(); var streams = new List<PdfPageBuilder.CopiedContentStream>();
if (pageInfo.Page.TryGet(NameToken.Contents, out IToken token)) if (pageInfo.Page.TryGet(NameToken.Contents, out IToken contentsToken))
{ {
if (token is ArrayToken array) if (contentsToken is ArrayToken array)
{ {
foreach (var item in array.Data) foreach (var item in array.Data)
{ {
@@ -341,7 +341,7 @@ namespace UglyToad.PdfPig.Writer
} }
} }
else if (token is IndirectReferenceToken ir) else if (contentsToken is IndirectReferenceToken ir)
{ {
streams.Add(new PdfPageBuilder.CopiedContentStream( streams.Add(new PdfPageBuilder.CopiedContentStream(
WriterUtil.CopyToken(context, ir, document.Structure.TokenScanner, refs) as IndirectReferenceToken)); WriterUtil.CopyToken(context, ir, document.Structure.TokenScanner, refs) as IndirectReferenceToken));
@@ -379,8 +379,6 @@ namespace UglyToad.PdfPig.Writer
WriterUtil.CopyToken(context, kvp.Value, document.Structure.TokenScanner, refs); WriterUtil.CopyToken(context, kvp.Value, document.Structure.TokenScanner, refs);
} }
// LocalizeFontAndXObject(resources); TODO work in progress
copiedPageDict[NameToken.Resources] = new DictionaryToken(resources); copiedPageDict[NameToken.Resources] = new DictionaryToken(resources);
var builder = new PdfPageBuilder(pages.Count + 1, this, streams, copiedPageDict); var builder = new PdfPageBuilder(pages.Count + 1, this, streams, copiedPageDict);
@@ -396,11 +394,11 @@ namespace UglyToad.PdfPig.Writer
} }
foreach (var item in dict.Data) foreach (var item in dict.Data)
{ {
if (!destinationDict.ContainsKey(NameToken.Create(item.Key))) if (!destinationDict.ContainsKey(NameToken.Create(item.Key)))
{ {
if (item.Value is IndirectReferenceToken ir) if (item.Value is IndirectReferenceToken ir)
{ {
// convert indirect to direct as PdfPageBuilder needs to modify resource entries
destinationDict[NameToken.Create(item.Key)] = WriterUtil.CopyToken(context, document.Structure.TokenScanner.Get(ir.Data).Data, document.Structure.TokenScanner, refs); destinationDict[NameToken.Create(item.Key)] = WriterUtil.CopyToken(context, document.Structure.TokenScanner.Get(ir.Data).Data, document.Structure.TokenScanner, refs);
} }
else else
@@ -411,13 +409,20 @@ namespace UglyToad.PdfPig.Writer
continue; continue;
} }
var subDict = GetRemoteDict(item.Value); var subDict = GetRemoteDict(item.Value);
var destSubDict = destinationDict[NameToken.Create(item.Key)] as DictionaryToken; var destSubDict = destinationDict[NameToken.Create(item.Key)] as DictionaryToken;
if (destSubDict == null || subDict == null) if (destSubDict == null || subDict == null)
{ {
// not a dict.. just overwrite with more important one? should maybe check arrays? // not a dict.. just overwrite with more important one? should maybe check arrays?
destinationDict[NameToken.Create(item.Key)] = WriterUtil.CopyToken(context, item.Value, document.Structure.TokenScanner, refs); if (item.Value is IndirectReferenceToken ir)
{
// convert indirect to direct as PdfPageBuilder needs to modify resource entries
destinationDict[NameToken.Create(item.Key)] = WriterUtil.CopyToken(context, document.Structure.TokenScanner.Get(ir.Data).Data, document.Structure.TokenScanner, refs);
}
else
{
destinationDict[NameToken.Create(item.Key)] = WriterUtil.CopyToken(context, item.Value, document.Structure.TokenScanner, refs);
}
continue; continue;
} }
foreach (var subItem in subDict.Data) foreach (var subItem in subDict.Data)