lsm/PdfPig
1
0
Fork 0
mirror of https://github.com/UglyToad/PdfPig.git synced 2025-08-20 09:00:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix copying of sub-dictionary when keys collide

Browse Source 
when copying from a ancestor node of a page's resource dictionary
we were incorrectly writing nested nodes of e.g. /fonts to the root
of the target dictionary, here we write to the intended target node
correctly
This commit is contained in:
EliotJones 2025-07-09 21:49:15 -05:00 committed by BobLd
parent 7fe60ff8c3
commit b11f936f22
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -501,9 +501,12 @@ namespace UglyToad.PdfPig.Writer
{ {
return; return;
} }
foreach (var item in dict.Data) foreach (var item in dict.Data)
{ {
if (!destinationDict.ContainsKey(NameToken.Create(item.Key))) var key = NameToken.Create(item.Key);
if (!destinationDict.ContainsKey(key))
{ {
if (item.Value is IndirectReferenceToken ir) if (item.Value is IndirectReferenceToken ir)
{ {
@ -512,43 +515,55 @@ namespace UglyToad.PdfPig.Writer
if (obj.Data is StreamToken) if (obj.Data is StreamToken)
{ {
// rare case, have seen /SubType as stream token, can't make direct // rare case, have seen /SubType as stream token, can't make direct
destinationDict[NameToken.Create(item.Key)] = WriterUtil.CopyToken(context, item.Value, document.Structure.TokenScanner, refs); destinationDict[key] = WriterUtil.CopyToken(context, item.Value, document.Structure.TokenScanner, refs);
} }
else else
{ {
destinationDict[NameToken.Create(item.Key)] = WriterUtil.CopyToken(context, obj.Data, document.Structure.TokenScanner, refs); destinationDict[key] = WriterUtil.CopyToken(context, obj.Data, document.Structure.TokenScanner, refs);
} }
} }
else else
{ {
destinationDict[NameToken.Create(item.Key)] = WriterUtil.CopyToken(context, item.Value, document.Structure.TokenScanner, refs); destinationDict[key] = WriterUtil.CopyToken(context, item.Value, document.Structure.TokenScanner, refs);
} }
continue; continue;
} }
var subDict = GetRemoteDict(item.Value); var subDict = GetRemoteDict(item.Value);
var destSubDict = destinationDict[NameToken.Create(item.Key)] as DictionaryToken; var destSubDict = destinationDict[key] as DictionaryToken;
if (destSubDict is null || subDict is null) if (destSubDict is null || subDict is 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?
if (item.Value is IndirectReferenceToken ir) if (item.Value is IndirectReferenceToken ir)
{ {
// convert indirect to direct as PdfPageBuilder needs to modify resource entries // 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[key] = WriterUtil.CopyToken(context, document.Structure.TokenScanner.Get(ir.Data).Data, document.Structure.TokenScanner, refs);
} }
else else
{ {
destinationDict[NameToken.Create(item.Key)] = WriterUtil.CopyToken(context, item.Value, document.Structure.TokenScanner, refs); destinationDict[key] = WriterUtil.CopyToken(context, item.Value, document.Structure.TokenScanner, refs);
} }
continue; continue;
} }
var mutableSubDict = new Dictionary<NameToken, IToken>();
foreach (var kvp in destSubDict.Data)
{
mutableSubDict[NameToken.Create(kvp.Key)] = kvp.Value;
}
foreach (var subItem in subDict.Data) foreach (var subItem in subDict.Data)
{ {
// last copied most important important // last copied most important
destinationDict[NameToken.Create(subItem.Key)] = WriterUtil.CopyToken(context, subItem.Value, mutableSubDict[NameToken.Create(subItem.Key)] = WriterUtil.CopyToken(
document.Structure.TokenScanner, refs); context,
subItem.Value,
document.Structure.TokenScanner,
refs);
} }
destinationDict[key] = new DictionaryToken(mutableSubDict);
} }
} }