diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2021-02-01 06:11:18 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2021-02-01 06:11:18 +0000 |
commit | 4f9de1dfebdc66d367d730252d6f224d37e96ee6 (patch) | |
tree | 3750421fabf3aa8a8e1f4f6d5558d489e9d4fe02 /Build/source/libs/xpdf/xpdf-src/xpdf/Catalog.cc | |
parent | 9d694205709f79666458dc2ee685767b28bcd9ac (diff) |
xpdf 4.03
git-svn-id: svn://tug.org/texlive/trunk@57588 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/xpdf/xpdf-src/xpdf/Catalog.cc')
-rw-r--r-- | Build/source/libs/xpdf/xpdf-src/xpdf/Catalog.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Build/source/libs/xpdf/xpdf-src/xpdf/Catalog.cc b/Build/source/libs/xpdf/xpdf-src/xpdf/Catalog.cc index bec30a8dcfd..6ea8fa89ff4 100644 --- a/Build/source/libs/xpdf/xpdf-src/xpdf/Catalog.cc +++ b/Build/source/libs/xpdf/xpdf-src/xpdf/Catalog.cc @@ -28,7 +28,7 @@ #include "Page.h" #include "Error.h" #include "Link.h" -#include "Form.h" +#include "AcroForm.h" #include "TextString.h" #include "Catalog.h" @@ -159,6 +159,7 @@ Catalog::Catalog(PDFDoc *docA) { baseURI = NULL; form = NULL; embeddedFiles = NULL; + pageLabels = NULL; #if MULTITHREADED gInitMutex(&pageMutex); #endif @@ -222,7 +223,7 @@ Catalog::Catalog(PDFDoc *docA) { catDict.dictLookup("AcroForm", &acroForm); // get the NeedsRendering flag - // NB: Form::load() uses this value + // NB: AcroForm::load() uses this value needsRendering = catDict.dictLookup("NeedsRendering", &obj)->isBool() && obj.getBool(); obj.free(); @@ -230,7 +231,7 @@ Catalog::Catalog(PDFDoc *docA) { // create the Form // (if acroForm is a null object, this will still create an AcroForm // if there are unattached Widget-type annots) - form = Form::load(doc, this, &acroForm); + form = AcroForm::load(doc, this, &acroForm); // get the OCProperties dictionary catDict.dictLookup("OCProperties", &ocProperties); @@ -241,7 +242,6 @@ Catalog::Catalog(PDFDoc *docA) { // get the ViewerPreferences object catDict.dictLookupNF("ViewerPreferences", &viewerPrefs); - pageLabels = NULL; if (catDict.dictLookup("PageLabels", &obj)->isDict()) { readPageLabelTree(&obj); } @@ -1190,7 +1190,7 @@ GBool Catalog::convertPageLabelToInt(TextString *pageLabel, int prefixLength, return gFalse; } } - *n = (len - prefixLength - 1) * 26 + (u[i] - (Unicode)style) + 1; + *n = (len - prefixLength - 1) * 26 + (u[prefixLength] - (Unicode)style) + 1; return gTrue; } return gFalse; |