diff --git a/pdf/model/page.go b/pdf/model/page.go index 933c596a..4e7946cc 100644 --- a/pdf/model/page.go +++ b/pdf/model/page.go @@ -22,23 +22,22 @@ import ( // PDF page object (7.7.3.3 - Table 30). type PdfPage struct { - Parent PdfObject - LastModified *PdfDate - Resources *PdfPageResources - CropBox *PdfRectangle - MediaBox *PdfRectangle - BleedBox *PdfRectangle - TrimBox *PdfRectangle - ArtBox *PdfRectangle - BoxColorInfo PdfObject - Contents PdfObject - Rotate *int64 - Group PdfObject - Thumb PdfObject - B PdfObject - Dur PdfObject - Trans PdfObject - //Annots PdfObject + Parent PdfObject + LastModified *PdfDate + Resources *PdfPageResources + CropBox *PdfRectangle + MediaBox *PdfRectangle + BleedBox *PdfRectangle + TrimBox *PdfRectangle + ArtBox *PdfRectangle + BoxColorInfo PdfObject + Contents PdfObject + Rotate *int64 + Group PdfObject + Thumb PdfObject + B PdfObject + Dur PdfObject + Trans PdfObject AA PdfObject Metadata PdfObject PieceInfo PdfObject @@ -51,7 +50,7 @@ type PdfPage struct { PresSteps PdfObject UserUnit PdfObject VP PdfObject - //Annotations + Annotations []*PdfAnnotation // Primitive container. diff --git a/pdf/model/reader.go b/pdf/model/reader.go index 4504162f..352c9bf3 100644 --- a/pdf/model/reader.go +++ b/pdf/model/reader.go @@ -462,11 +462,6 @@ func (this *PdfReader) loadForms() (*PdfAcroForm, error) { common.Log.Trace("Has Acro forms") // Load it. - acroForm, err := this.newPdfAcroFormFromDict(formsDict) - if err != nil { - return nil, err - } - // Ensure we have access to everything. common.Log.Trace("Traverse the Acroforms structure") err = this.traverseObjectData(formsDict) @@ -475,6 +470,12 @@ func (this *PdfReader) loadForms() (*PdfAcroForm, error) { return nil, err } + // Create the acro forms object. + acroForm, err := this.newPdfAcroFormFromDict(formsDict) + if err != nil { + return nil, err + } + return acroForm, nil }