OrgGo/unipdf
1
0
Fork 0
mirror of https://github.com/unidoc/unipdf.git synced 2025-04-30 13:48:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved handling of un-referenced Parent objects in writer

Browse Source
This commit is contained in:
Gunnsteinn Hall 2016-12-06 01:18:44 +00:00
parent 9fe3c5a0b9
commit 8846983e79
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pdf/model/writer.go
View File

@ -81,7 +81,9 @@ type PdfWriter struct {
// Objects to be followed up on prior to writing. // Objects to be followed up on prior to writing.
// These are objects that are added and reference objects that are not included // These are objects that are added and reference objects that are not included
// for writing. // for writing.
pendingObjects map[PdfObject]bool // The map stores the object and the dictionary it is contained in.
// Only way so we can access the dictionary entry later.
pendingObjects map[PdfObject]*PdfObjectDictionary
// Forms. // Forms.
acroForm *PdfAcroForm acroForm *PdfAcroForm
@ -92,7 +94,7 @@ func NewPdfWriter() PdfWriter {
w.objectsMap = map[PdfObject]bool{} w.objectsMap = map[PdfObject]bool{}
w.objects = []PdfObject{} w.objects = []PdfObject{}
w.pendingObjects = map[PdfObject]bool{} w.pendingObjects = map[PdfObject]*PdfObjectDictionary{}
// Creation info. // Creation info.
infoDict := PdfObjectDictionary{} infoDict := PdfObjectDictionary{}
@ -202,8 +204,8 @@ func (this *PdfWriter) addObjects(obj PdfObject) error {
} }
if hasObj := this.hasObject(v); !hasObj { if hasObj := this.hasObject(v); !hasObj {
fmt.Printf("Parent obj is missing!! %T %p %v\n", v, v, v) common.Log.Debug("Parent obj is missing!! %T %p %v\n", v, v, v)
this.pendingObjects[v] = true this.pendingObjects[v] = dict
// Although it is missing at this point, it could be added later... // Although it is missing at this point, it could be added later...
} }
// How to handle the parent? Make sure it is present? // How to handle the parent? Make sure it is present?
@ -615,10 +617,16 @@ func (this *PdfWriter) Write(ws io.WriteSeeker) error {
} }
// Check pending objects prior to write. // Check pending objects prior to write.
for pendingObj, _ := range this.pendingObjects { for pendingObj, pendingObjDict := range this.pendingObjects {
if !this.hasObject(pendingObj) { if !this.hasObject(pendingObj) {
common.Log.Debug("ERROR Pending object %+v %T (%p) never added for writing", pendingObj, pendingObj, pendingObj) common.Log.Debug("ERROR Pending object %+v %T (%p) never added for writing", pendingObj, pendingObj, pendingObj)
return fmt.Errorf("Pending object %+v %T never added for writing", pendingObj, pendingObj) for key, val := range *pendingObjDict {
if val == pendingObj {
common.Log.Debug("Pending object found! and replaced with null")
(*pendingObjDict)[key] = MakeNull()
break
}
}
} }
} }