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

Fix annotation flatten when AcroForm does not exist (#93)

Browse Source 
* Fix annotation flatten when AcroForm does not exist.
* Adapt test case file hashes to account for file flattening
This commit is contained in:
Adrian-George Bostan 2019-06-25 22:29:03 +03:00 committed by Gunnsteinn Hall
parent 7a9a8ff542
commit d8dcc051b3
3 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
internal/e2etest/fdfmerge_test.go
View File

@ -33,19 +33,19 @@ var (
// fdfMergeHashes defines a list of known output hashes to ensure that the output is constant. // fdfMergeHashes defines a list of known output hashes to ensure that the output is constant.
// If there is a change in hash need to find out why and update only if the change is accepted. // If there is a change in hash need to find out why and update only if the change is accepted.
var fdfMergeHashes = map[string]string{ var fdfMergeHashes = map[string]string{
"NW_null_Business_V04.fdf": "45ccf325025b366d6e9c90bde53da1aa", "NW_null_Business_V04.fdf": "6e33f219994e4b9ee1e1843c976504df",
"NW_null_Business_V05.fdf": "49c0c89cd2384c8a75f9cb20a778698f", "NW_null_Business_V05.fdf": "ff1f8bd39f9be9844a6d85bafe07c790",
"NW_null_Business_V05.v1.2.fdf": "49c0c89cd2384c8a75f9cb20a778698f", "NW_null_Business_V05.v1.2.fdf": "ff1f8bd39f9be9844a6d85bafe07c790",
"NW_null_Contract_V04.fdf": "80ebec761eba106cda38a4613819634e", "NW_null_Contract_V04.fdf": "a54f4b42dc34997cfb701ef647cdbdfe",
"N_null_Contract.fdf": "557e9d5788ba418e3e5f6ffdf710a3b9", "N_null_Contract.fdf": "c173340d6492984532cf51a4f5ceb4b6",
"Network_Contract_V01.fdf": "3bf058c9e4cefae222c92caa28fca603", "Network_Contract_V01.fdf": "0ae2537bf8a8366aa97c1ca965b88d1f",
"checkmark_check.fdf": "b95c8f8c0673e5541d28f212c0b25b5b", "checkmark_check.fdf": "8892cdb01318421f8d198233b80ab8e3",
"checkmark_circle.fdf": "06bda9e3539e63aebdfc20f8fe3d83e9", "checkmark_circle.fdf": "3b1e6ef6aae2a7497b090e0960d2c163",
"checkmark_cross.fdf": "34dc015cf122bffcef8c62c559fc0ac7", "checkmark_cross.fdf": "6b16b6d7437a3f59a7e9e72c1ecfd59b",
"checkmark_diamond.fdf": "5a3c2951da0aa2943e9007d4baed82bf", "checkmark_diamond.fdf": "123488e428914832f21e213339ed74f1",
"checkmark_square.fdf": "83d97592cd75c2c62a2e6ae2962379db", "checkmark_square.fdf": "d0ac69dac7a933e440a5005b1712edeb",
"checkmark_star.fdf": "2e460f069e474714573724255fcdffda", "checkmark_star.fdf": "1326f152fb8158dffc08e5bb51cba1bc",
"test_fail.fdf": "d7eb6071341f823a64f7234a20830d74", "test_fail.fdf": "9a90cef679d6b4c13017c73c2528ca75",
} }
// Test filling (fdf merge) and flattening form data and annotations. // Test filling (fdf merge) and flattening form data and annotations.
@ -152,13 +152,6 @@ func fdfMergeSingle(t *testing.T, params fdfMergeParams) {
pdfWriter.SetForms(nil) pdfWriter.SetForms(nil)
for _, p := range pdfReader.PageList { for _, p := range pdfReader.PageList {
// FIXME: Hack needed to ensure that annotations are loaded.
// TODO: Remove. Resolved in PR#93.
{
_, err := p.GetAnnotations()
require.NoError(t, err)
}
err = pdfWriter.AddPage(p) err = pdfWriter.AddPage(p)
require.NoError(t, err) require.NoError(t, err)
} }

22
model/flatten.go
View File

@ -40,12 +40,12 @@ func (r *PdfReader) FlattenFields(allannots bool, appgen FieldAppearanceGenerato
// The bool value indicates whether the annotation has value content. // The bool value indicates whether the annotation has value content.
ftargets := map[*PdfAnnotation]bool{} ftargets := map[*PdfAnnotation]bool{}
{ {
var fields []*PdfField
acroForm := r.AcroForm acroForm := r.AcroForm
if acroForm == nil { if acroForm != nil {
return nil fields = acroForm.AllFields()
} }
fields := acroForm.AllFields()
for _, field := range fields { for _, field := range fields {
for _, wa := range field.Annotations { for _, wa := range field.Annotations {
// TODO(gunnsth): Check if wa.Flags() has Print flag then include, otherwise exclude. // TODO(gunnsth): Check if wa.Flags() has Print flag then include, otherwise exclude.
@ -69,7 +69,12 @@ func (r *PdfReader) FlattenFields(allannots bool, appgen FieldAppearanceGenerato
// If all annotations are to be flattened, add to targets. // If all annotations are to be flattened, add to targets.
if allannots { if allannots {
for _, page := range r.PageList { for _, page := range r.PageList {
for _, annot := range page.annotations { annotations, err := page.GetAnnotations()
if err != nil {
return err
}
for _, annot := range annotations {
ftargets[annot] = true ftargets[annot] = true
} }
} }
@ -85,7 +90,12 @@ func (r *PdfReader) FlattenFields(allannots bool, appgen FieldAppearanceGenerato
return err return err
} }
for _, annot := range page.annotations { annotations, err := page.GetAnnotations()
if err != nil {
return err
}
for _, annot := range annotations {
hasV, toflatten := ftargets[annot] hasV, toflatten := ftargets[annot]
if !toflatten { if !toflatten {
// Not to be flattened. // Not to be flattened.
@ -164,7 +174,7 @@ func (r *PdfReader) FlattenFields(allannots bool, appgen FieldAppearanceGenerato
if len(annots) > 0 { if len(annots) > 0 {
page.annotations = annots page.annotations = annots
} else { } else {
page.annotations = nil page.annotations = []*PdfAnnotation{}
} }
} }

5
model/page.go
View File

@ -500,7 +500,10 @@ func (p *PdfPage) GetPageDict() *core.PdfObjectDictionary {
arr.Append(annot.ToPdfObject()) arr.Append(annot.ToPdfObject())
} }
} }
d.Set("Annots", arr)
if arr.Len() > 0 {
d.Set("Annots", arr)
}
} else if p.Annots != nil { } else if p.Annots != nil {
d.SetIfNotNil("Annots", p.Annots) d.SetIfNotNil("Annots", p.Annots)
} }