AcroForm.cc (xpdf-4.03) | : | AcroForm.cc (xpdf-4.04) | ||
---|---|---|---|---|
skipping to change at line 21 | skipping to change at line 21 | |||
#ifdef USE_GCC_PRAGMAS | #ifdef USE_GCC_PRAGMAS | |||
#pragma implementation | #pragma implementation | |||
#endif | #endif | |||
#include <stdlib.h> | #include <stdlib.h> | |||
#include <math.h> | #include <math.h> | |||
#include "gmem.h" | #include "gmem.h" | |||
#include "gmempp.h" | #include "gmempp.h" | |||
#include "GString.h" | #include "GString.h" | |||
#include "GList.h" | #include "GList.h" | |||
#include "GlobalParams.h" | ||||
#include "Error.h" | #include "Error.h" | |||
#include "Object.h" | #include "Object.h" | |||
#include "PDFDoc.h" | #include "PDFDoc.h" | |||
#include "TextString.h" | #include "TextString.h" | |||
#include "Gfx.h" | #include "Gfx.h" | |||
#include "GfxFont.h" | #include "GfxFont.h" | |||
#include "OptionalContent.h" | #include "OptionalContent.h" | |||
#include "Annot.h" | #include "Annot.h" | |||
#include "Lexer.h" | #include "Lexer.h" | |||
#include "XFAScanner.h" | #include "XFAScanner.h" | |||
skipping to change at line 351 | skipping to change at line 352 | |||
Object acroFormObj2; | Object acroFormObj2; | |||
AcroForm *acroForm; | AcroForm *acroForm; | |||
AcroFormField *field; | AcroFormField *field; | |||
Object xfaObj, fieldsObj, annotsObj, annotRef, annotObj, obj1, obj2; | Object xfaObj, fieldsObj, annotsObj, annotRef, annotObj, obj1, obj2; | |||
int pageNum, i, j; | int pageNum, i, j; | |||
// this is the normal case: acroFormObj is a dictionary, as expected | // this is the normal case: acroFormObj is a dictionary, as expected | |||
if (acroFormObjA->isDict()) { | if (acroFormObjA->isDict()) { | |||
acroForm = new AcroForm(docA, acroFormObjA); | acroForm = new AcroForm(docA, acroFormObjA); | |||
if (!acroFormObjA->dictLookup("XFA", &xfaObj)->isNull()) { | if (globalParams->getEnableXFA()) { | |||
acroForm->xfaScanner = XFAScanner::load(&xfaObj); | if (!acroFormObjA->dictLookup("XFA", &xfaObj)->isNull()) { | |||
if (!catalog->getNeedsRendering()) { | acroForm->xfaScanner = XFAScanner::load(&xfaObj); | |||
acroForm->isStaticXFA = gTrue; | if (!catalog->getNeedsRendering()) { | |||
acroForm->isStaticXFA = gTrue; | ||||
} | ||||
} | } | |||
xfaObj.free(); | ||||
} | } | |||
xfaObj.free(); | ||||
if (acroFormObjA->dictLookup("NeedAppearances", &obj1)->isBool()) { | if (acroFormObjA->dictLookup("NeedAppearances", &obj1)->isBool()) { | |||
acroForm->needAppearances = obj1.getBool(); | acroForm->needAppearances = obj1.getBool(); | |||
} | } | |||
obj1.free(); | obj1.free(); | |||
acroForm->buildAnnotPageList(catalog); | acroForm->buildAnnotPageList(catalog); | |||
if (!acroFormObjA->dictLookup("Fields", &obj1)->isArray()) { | if (!acroFormObjA->dictLookup("Fields", &obj1)->isArray()) { | |||
if (!obj1.isNull()) { | if (!obj1.isNull()) { | |||
End of changes. 4 change blocks. | ||||
5 lines changed or deleted | 8 lines changed or added |