summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/include/fpdfapi/fpdf_parser.h30
-rw-r--r--fpdfsdk/src/fpdf_dataavail.cpp26
-rw-r--r--fpdfsdk/src/fpdfppo.cpp164
-rw-r--r--fpdfsdk/src/fpdfview.cpp7
-rw-r--r--fpdfsdk/src/fsdk_annothandler.cpp4
-rw-r--r--fpdfsdk/src/fsdk_baseannot.cpp2
-rw-r--r--fpdfsdk/src/javascript/Document.cpp4
-rw-r--r--fpdfsdk/src/javascript/JS_Runtime.cpp7
-rw-r--r--fpdfsdk/src/javascript/PublicMethods.cpp16
9 files changed, 147 insertions, 113 deletions
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index a9e79ae9e2..3d10726a4e 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -884,7 +884,35 @@ class IFX_DownloadHints {
class IPDF_DataAvail {
public:
- static IPDF_DataAvail* Create(IFX_FileAvail* pFileAvail,
+ // Must match PDF_DATA_* definitions in public/fpdf_dataavail.h, but cannot
+ // #include that header. fpdfsdk/src/fpdf_dataavail.cpp has static_asserts
+ // to make sure the two sets of values match.
+ enum DocAvailStatus {
+ DataError = -1, // PDF_DATA_ERROR
+ DataNotAvailable = 0, // PDF_DATA_NOTAVAIL
+ DataAvailable = 1, // PDF_DATA_AVAIL
+ };
+
+ // Must match PDF_*LINEAR* definitions in public/fpdf_dataavail.h, but cannot
+ // #include that header. fpdfsdk/src/fpdf_dataavail.cpp has static_asserts
+ // to make sure the two sets of values match.
+ enum DocLinearizationStatus {
+ LinearizationUnknown = -1, // PDF_LINEARIZATION_UNKNOWN
+ NotLinearized = 0, // PDF_NOT_LINEARIZED
+ Linearized = 1, // PDF_LINEARIZED
+ };
+
+ // Must match PDF_FORM_* definitions in public/fpdf_dataavail.h, but cannot
+ // #include that header. fpdfsdk/src/fpdf_dataavail.cpp has static_asserts
+ // to make sure the two sets of values match.
+ enum DocFormStatus {
+ FormError = -1, // PDF_FORM_ERROR
+ FormNotAvailable = 0, // PDF_FORM_NOTAVAIL
+ FormAvailable = 1, // PDF_FORM_AVAIL
+ FormNotExist = 2, // PDF_FORM_NOTEXIST
+ };
+
+static IPDF_DataAvail* Create(IFX_FileAvail* pFileAvail,
IFX_FileRead* pFileRead);
virtual ~IPDF_DataAvail() {}
diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/src/fpdf_dataavail.cpp
index 0bd5add9a7..9fe2fa82b1 100644
--- a/fpdfsdk/src/fpdf_dataavail.cpp
+++ b/fpdfsdk/src/fpdf_dataavail.cpp
@@ -6,11 +6,33 @@
#include "public/fpdf_dataavail.h"
-#include "../include/fpdfxfa/fpdfxfa_app.h"
-#include "../include/fpdfxfa/fpdfxfa_doc.h"
#include "fpdfsdk/include/fsdk_define.h"
#include "public/fpdf_formfill.h"
+// These checks are here because core/ and public/ cannot depend on each other.
+static_assert(IPDF_DataAvail::DataError == PDF_DATA_ERROR,
+ "IPDF_DataAvail::DataError value mismatch");
+static_assert(IPDF_DataAvail::DataNotAvailable == PDF_DATA_NOTAVAIL,
+ "IPDF_DataAvail::DataNotAvailable value mismatch");
+static_assert(IPDF_DataAvail::DataAvailable == PDF_DATA_AVAIL,
+ "IPDF_DataAvail::DataAvailable value mismatch");
+
+static_assert(IPDF_DataAvail::LinearizationUnknown == PDF_LINEARIZATION_UNKNOWN,
+ "IPDF_DataAvail::LinearizationUnknown value mismatch");
+static_assert(IPDF_DataAvail::NotLinearized == PDF_NOT_LINEARIZED,
+ "IPDF_DataAvail::NotLinearized value mismatch");
+static_assert(IPDF_DataAvail::Linearized == PDF_LINEARIZED,
+ "IPDF_DataAvail::Linearized value mismatch");
+
+static_assert(IPDF_DataAvail::FormError == PDF_FORM_ERROR,
+ "IPDF_DataAvail::FormError value mismatch");
+static_assert(IPDF_DataAvail::FormNotAvailable == PDF_FORM_NOTAVAIL,
+ "IPDF_DataAvail::FormNotAvailable value mismatch");
+static_assert(IPDF_DataAvail::FormAvailable == PDF_FORM_AVAIL,
+ "IPDF_DataAvail::FormAvailable value mismatch");
+static_assert(IPDF_DataAvail::FormNotExist == PDF_FORM_NOTEXIST,
+ "IPDF_DataAvail::FormNotExist value mismatch");
+
class CFPDF_FileAvailWrap : public IFX_FileAvail {
public:
CFPDF_FileAvailWrap() { m_pfileAvail = NULL; }
diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp
index e085568cbd..6ae6531e4a 100644
--- a/fpdfsdk/src/fpdfppo.cpp
+++ b/fpdfsdk/src/fpdfppo.cpp
@@ -8,13 +8,14 @@
#include "../include/fpdfxfa/fpdfxfa_doc.h"
#include "fpdfsdk/include/fsdk_define.h"
+#include "third_party/base/nonstd_unique_ptr.h"
class CPDF_PageOrganizer {
public:
+ using ObjectNumberMap = std::map<FX_DWORD, FX_DWORD>;
CPDF_PageOrganizer();
~CPDF_PageOrganizer();
- public:
FX_BOOL PDFDocInit(CPDF_Document* pDestPDFDoc, CPDF_Document* pSrcPDFDoc);
FX_BOOL ExportPage(CPDF_Document* pSrcPDFDoc,
CFX_WordArray* nPageNum,
@@ -24,10 +25,10 @@ class CPDF_PageOrganizer {
CFX_ByteString nSrctag);
FX_BOOL UpdateReference(CPDF_Object* pObj,
CPDF_Document* pDoc,
- CFX_MapPtrToPtr* pMapPtrToPtr);
- int GetNewObjId(CPDF_Document* pDoc,
- CFX_MapPtrToPtr* pMapPtrToPtr,
- CPDF_Reference* pRef);
+ ObjectNumberMap* pObjNumberMap);
+ FX_DWORD GetNewObjId(CPDF_Document* pDoc,
+ ObjectNumberMap* pObjNumberMap,
+ CPDF_Reference* pRef);
};
CPDF_PageOrganizer::CPDF_PageOrganizer() {}
@@ -37,7 +38,7 @@ CPDF_PageOrganizer::~CPDF_PageOrganizer() {}
FX_BOOL CPDF_PageOrganizer::PDFDocInit(CPDF_Document* pDestPDFDoc,
CPDF_Document* pSrcPDFDoc) {
if (!pDestPDFDoc || !pSrcPDFDoc)
- return false;
+ return FALSE;
CPDF_Dictionary* pNewRoot = pDestPDFDoc->GetRoot();
if (!pNewRoot)
@@ -46,7 +47,6 @@ FX_BOOL CPDF_PageOrganizer::PDFDocInit(CPDF_Document* pDestPDFDoc,
// Set the document information////////////////////////////////////////////
CPDF_Dictionary* DInfoDict = pDestPDFDoc->GetInfo();
-
if (!DInfoDict)
return FALSE;
@@ -60,10 +60,9 @@ FX_BOOL CPDF_PageOrganizer::PDFDocInit(CPDF_Document* pDestPDFDoc,
pNewRoot->SetAt("Type", new CPDF_Name("Catalog"));
}
- CPDF_Dictionary* pNewPages = ToDictionary(
- pNewRoot->GetElement("Pages") ? pNewRoot->GetElement("Pages")->GetDirect()
- : nullptr);
-
+ CPDF_Object* pElement = pNewRoot->GetElement("Pages");
+ CPDF_Dictionary* pNewPages =
+ pElement ? ToDictionary(pElement->GetDirect()) : nullptr;
if (!pNewPages) {
pNewPages = new CPDF_Dictionary;
FX_DWORD NewPagesON = pDestPDFDoc->AddIndirectObject(pNewPages);
@@ -76,18 +75,16 @@ FX_BOOL CPDF_PageOrganizer::PDFDocInit(CPDF_Document* pDestPDFDoc,
}
CPDF_Array* pKeysArray = pNewPages->GetArray("Kids");
- if (pKeysArray == NULL) {
+ if (!pKeysArray) {
CPDF_Array* pNewKids = new CPDF_Array;
FX_DWORD Kidsobjnum = -1;
- Kidsobjnum =
- pDestPDFDoc->AddIndirectObject(pNewKids); //, Kidsobjnum, Kidsgennum);
+ Kidsobjnum = pDestPDFDoc->AddIndirectObject(pNewKids);
- pNewPages->SetAt(
- "Kids", new CPDF_Reference(pDestPDFDoc, Kidsobjnum)); //, Kidsgennum));
+ pNewPages->SetAt("Kids", new CPDF_Reference(pDestPDFDoc, Kidsobjnum));
pNewPages->SetAt("Count", new CPDF_Number(0));
}
- return true;
+ return TRUE;
}
FX_BOOL CPDF_PageOrganizer::ExportPage(CPDF_Document* pSrcPDFDoc,
@@ -96,16 +93,13 @@ FX_BOOL CPDF_PageOrganizer::ExportPage(CPDF_Document* pSrcPDFDoc,
int nIndex) {
int curpage = nIndex;
- CFX_MapPtrToPtr* pMapPtrToPtr = new CFX_MapPtrToPtr;
- pMapPtrToPtr->InitHashTable(1001);
+ nonstd::unique_ptr<ObjectNumberMap> pObjNumberMap(new ObjectNumberMap);
- for (int i = 0; i < nPageNum->GetSize(); i++) {
+ for (int i = 0; i < nPageNum->GetSize(); ++i) {
CPDF_Dictionary* pCurPageDict = pDestPDFDoc->CreateNewPage(curpage);
CPDF_Dictionary* pSrcPageDict = pSrcPDFDoc->GetPage(nPageNum->GetAt(i) - 1);
- if (!pSrcPageDict || !pCurPageDict) {
- delete pMapPtrToPtr;
+ if (!pSrcPageDict || !pCurPageDict)
return FALSE;
- }
// Clone the page dictionary///////////
FX_POSITION SrcPos = pSrcPageDict->GetStartPos();
@@ -120,17 +114,17 @@ FX_BOOL CPDF_PageOrganizer::ExportPage(CPDF_Document* pSrcPDFDoc,
}
// inheritable item///////////////////////
- CPDF_Object* pInheritable = NULL;
+ CPDF_Object* pInheritable = nullptr;
// 1 MediaBox //required
if (!pCurPageDict->KeyExist("MediaBox")) {
pInheritable = PageDictGetInheritableTag(pSrcPageDict, "MediaBox");
if (!pInheritable) {
- // Search the "CropBox" from source page dictionary, if not exists,we
- // take the letter size.
+ // Search the "CropBox" from source page dictionary,
+ // if not exists,we take the letter size.
pInheritable = PageDictGetInheritableTag(pSrcPageDict, "CropBox");
- if (pInheritable)
+ if (pInheritable) {
pCurPageDict->SetAt("MediaBox", pInheritable->Clone());
- else {
+ } else {
// Make the default size to be letter size (8.5'x11')
CPDF_Array* pArray = new CPDF_Array;
pArray->AddNumber(0);
@@ -139,16 +133,15 @@ FX_BOOL CPDF_PageOrganizer::ExportPage(CPDF_Document* pSrcPDFDoc,
pArray->AddNumber(792);
pCurPageDict->SetAt("MediaBox", pArray);
}
- } else
+ } else {
pCurPageDict->SetAt("MediaBox", pInheritable->Clone());
+ }
}
// 2 Resources //required
if (!pCurPageDict->KeyExist("Resources")) {
pInheritable = PageDictGetInheritableTag(pSrcPageDict, "Resources");
- if (!pInheritable) {
- delete pMapPtrToPtr;
+ if (!pInheritable)
return FALSE;
- }
pCurPageDict->SetAt("Resources", pInheritable->Clone());
}
// 3 CropBox //Optional
@@ -169,30 +162,28 @@ FX_BOOL CPDF_PageOrganizer::ExportPage(CPDF_Document* pSrcPDFDoc,
FX_DWORD dwOldPageObj = pSrcPageDict->GetObjNum();
FX_DWORD dwNewPageObj = pCurPageDict->GetObjNum();
- pMapPtrToPtr->SetAt((void*)(uintptr_t)dwOldPageObj,
- (void*)(uintptr_t)dwNewPageObj);
+ (*pObjNumberMap)[dwOldPageObj] = dwNewPageObj;
- UpdateReference(pCurPageDict, pDestPDFDoc, pMapPtrToPtr);
- curpage++;
+ UpdateReference(pCurPageDict, pDestPDFDoc, pObjNumberMap.get());
+ ++curpage;
}
- delete pMapPtrToPtr;
return TRUE;
}
CPDF_Object* CPDF_PageOrganizer::PageDictGetInheritableTag(
CPDF_Dictionary* pDict,
CFX_ByteString nSrctag) {
- if (!pDict || !pDict->KeyExist("Type") || nSrctag.IsEmpty())
- return NULL;
+ if (!pDict || nSrctag.IsEmpty())
+ return nullptr;
+ if (!pDict->KeyExist("Parent") || !pDict->KeyExist("Type"))
+ return nullptr;
CPDF_Object* pType = pDict->GetElement("Type")->GetDirect();
if (!ToName(pType))
return nullptr;
if (pType->GetString().Compare("Page"))
- return NULL;
- if (!pDict->KeyExist("Parent"))
- return NULL;
+ return nullptr;
CPDF_Dictionary* pp = ToDictionary(pDict->GetElement("Parent")->GetDirect());
if (!pp)
@@ -204,9 +195,8 @@ CPDF_Object* CPDF_PageOrganizer::PageDictGetInheritableTag(
while (pp) {
if (pp->KeyExist((const char*)nSrctag))
return pp->GetElement((const char*)nSrctag);
- if (!pp->KeyExist("Parent")) {
+ if (!pp->KeyExist("Parent"))
break;
- }
pp = ToDictionary(pp->GetElement("Parent")->GetDirect());
}
return nullptr;
@@ -214,11 +204,11 @@ CPDF_Object* CPDF_PageOrganizer::PageDictGetInheritableTag(
FX_BOOL CPDF_PageOrganizer::UpdateReference(CPDF_Object* pObj,
CPDF_Document* pDoc,
- CFX_MapPtrToPtr* pMapPtrToPtr) {
+ ObjectNumberMap* pObjNumberMap) {
switch (pObj->GetType()) {
case PDFOBJ_REFERENCE: {
CPDF_Reference* pReference = pObj->AsReference();
- int newobjnum = GetNewObjId(pDoc, pMapPtrToPtr, pReference);
+ FX_DWORD newobjnum = GetNewObjId(pDoc, pObjNumberMap, pReference);
if (newobjnum == 0)
return FALSE;
pReference->SetRef(pDoc, newobjnum);
@@ -232,25 +222,26 @@ FX_BOOL CPDF_PageOrganizer::UpdateReference(CPDF_Object* pObj,
CFX_ByteString key("");
CPDF_Object* pNextObj = pDict->GetNextElement(pos, key);
if (!FXSYS_strcmp(key, "Parent") || !FXSYS_strcmp(key, "Prev") ||
- !FXSYS_strcmp(key, "First"))
+ !FXSYS_strcmp(key, "First")) {
continue;
+ }
if (pNextObj) {
- if (!UpdateReference(pNextObj, pDoc, pMapPtrToPtr))
+ if (!UpdateReference(pNextObj, pDoc, pObjNumberMap))
pDict->RemoveAt(key);
- } else
+ } else {
return FALSE;
+ }
}
break;
}
case PDFOBJ_ARRAY: {
CPDF_Array* pArray = pObj->AsArray();
FX_DWORD count = pArray->GetCount();
- for (FX_DWORD i = 0; i < count; i++) {
+ for (FX_DWORD i = 0; i < count; ++i) {
CPDF_Object* pNextObj = pArray->GetElement(i);
- if (pNextObj) {
- if (!UpdateReference(pNextObj, pDoc, pMapPtrToPtr))
- return FALSE;
- } else
+ if (!pNextObj)
+ return FALSE;
+ if (!UpdateReference(pNextObj, pDoc, pObjNumberMap))
return FALSE;
}
break;
@@ -259,10 +250,11 @@ FX_BOOL CPDF_PageOrganizer::UpdateReference(CPDF_Object* pObj,
CPDF_Stream* pStream = pObj->AsStream();
CPDF_Dictionary* pDict = pStream->GetDict();
if (pDict) {
- if (!UpdateReference(pDict, pDoc, pMapPtrToPtr))
+ if (!UpdateReference(pDict, pDoc, pObjNumberMap))
return FALSE;
- } else
+ } else {
return FALSE;
+ }
break;
}
default:
@@ -272,29 +264,27 @@ FX_BOOL CPDF_PageOrganizer::UpdateReference(CPDF_Object* pObj,
return TRUE;
}
-int CPDF_PageOrganizer::GetNewObjId(CPDF_Document* pDoc,
- CFX_MapPtrToPtr* pMapPtrToPtr,
- CPDF_Reference* pRef) {
+FX_DWORD CPDF_PageOrganizer::GetNewObjId(CPDF_Document* pDoc,
+ ObjectNumberMap* pObjNumberMap,
+ CPDF_Reference* pRef) {
if (!pRef)
return 0;
- size_t dwObjnum = pRef->GetRefObjNum();
- size_t dwNewObjNum = 0;
-
- pMapPtrToPtr->Lookup((void*)dwObjnum, (void*&)dwNewObjNum);
- if (dwNewObjNum) {
- return (int)dwNewObjNum;
- }
+ FX_DWORD dwObjnum = pRef->GetRefObjNum();
+ FX_DWORD dwNewObjNum = 0;
+ const auto it = pObjNumberMap->find(dwObjnum);
+ if (it != pObjNumberMap->end())
+ dwNewObjNum = it->second;
+ if (dwNewObjNum)
+ return dwNewObjNum;
CPDF_Object* pDirect = pRef->GetDirect();
- if (!pDirect) {
+ if (!pDirect)
return 0;
- }
CPDF_Object* pClone = pDirect->Clone();
- if (!pClone) {
+ if (!pClone)
return 0;
- }
if (CPDF_Dictionary* pDictClone = pClone->AsDictionary()) {
if (pDictClone->KeyExist("Type")) {
@@ -302,21 +292,20 @@ int CPDF_PageOrganizer::GetNewObjId(CPDF_Document* pDoc,
if (!FXSYS_stricmp(strType, "Pages")) {
pDictClone->Release();
return 4;
- } else if (!FXSYS_stricmp(strType, "Page")) {
+ }
+ if (!FXSYS_stricmp(strType, "Page")) {
pDictClone->Release();
return 0;
}
}
}
-
dwNewObjNum = pDoc->AddIndirectObject(pClone);
- pMapPtrToPtr->SetAt((void*)dwObjnum, (void*)dwNewObjNum);
- if (!UpdateReference(pClone, pDoc, pMapPtrToPtr)) {
+ (*pObjNumberMap)[dwObjnum] = dwNewObjNum;
+ if (!UpdateReference(pClone, pDoc, pObjNumberMap)) {
pClone->Release();
return 0;
}
-
- return (int)dwNewObjNum;
+ return dwNewObjNum;
}
FPDF_BOOL ParserPageRangeString(CFX_ByteString rangstring,
@@ -326,7 +315,7 @@ FPDF_BOOL ParserPageRangeString(CFX_ByteString rangstring,
rangstring.Remove(' ');
int nLength = rangstring.GetLength();
CFX_ByteString cbCompareString("0123456789-,");
- for (int i = 0; i < nLength; i++) {
+ for (int i = 0; i < nLength; ++i) {
if (cbCompareString.Find(rangstring[i]) == -1)
return FALSE;
}
@@ -335,35 +324,33 @@ FPDF_BOOL ParserPageRangeString(CFX_ByteString rangstring,
int nStringTo = 0;
while (nStringTo < nLength) {
nStringTo = rangstring.Find(',', nStringFrom);
- if (nStringTo == -1) {
+ if (nStringTo == -1)
nStringTo = nLength;
- }
cbMidRange = rangstring.Mid(nStringFrom, nStringTo - nStringFrom);
-
int nMid = cbMidRange.Find('-');
if (nMid == -1) {
long lPageNum = atol(cbMidRange);
if (lPageNum <= 0 || lPageNum > nCount)
return FALSE;
-
pageArray->Add((FX_WORD)lPageNum);
} else {
int nStartPageNum = atol(cbMidRange.Mid(0, nMid));
if (nStartPageNum == 0)
return FALSE;
- nMid = nMid + 1;
+ ++nMid;
int nEnd = cbMidRange.GetLength() - nMid;
if (nEnd == 0)
return FALSE;
int nEndPageNum = atol(cbMidRange.Mid(nMid, nEnd));
if (nStartPageNum < 0 || nStartPageNum > nEndPageNum ||
- nEndPageNum > nCount)
+ nEndPageNum > nCount) {
return FALSE;
-
- for (int nIndex = nStartPageNum; nIndex <= nEndPageNum; ++nIndex)
- pageArray->Add(nIndex);
+ }
+ for (int i = nStartPageNum; i <= nEndPageNum; ++i) {
+ pageArray->Add(i);
+ }
}
nStringFrom = nStringTo + 1;
}
@@ -382,13 +369,14 @@ DLLEXPORT FPDF_BOOL STDCALL FPDF_ImportPages(FPDF_DOCUMENT dest_doc,
CPDF_Document* pSrcDoc = CPDFDocumentFromFPDFDocument(src_doc);
if (!pSrcDoc)
return FALSE;
+
CFX_WordArray pageArray;
int nCount = pSrcDoc->GetPageCount();
if (pagerange) {
- if (ParserPageRangeString(pagerange, &pageArray, nCount) == FALSE)
+ if (!ParserPageRangeString(pagerange, &pageArray, nCount))
return FALSE;
} else {
- for (int i = 1; i <= nCount; i++) {
+ for (int i = 1; i <= nCount; ++i) {
pageArray.Add(i);
}
}
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp
index 78ef65f018..8da56dc3b6 100644
--- a/fpdfsdk/src/fpdfview.cpp
+++ b/fpdfsdk/src/fpdfview.cpp
@@ -192,8 +192,8 @@ DLLEXPORT void STDCALL FPDF_InitLibrary() {
FPDF_InitLibraryWithConfig(nullptr);
}
-DLLEXPORT void STDCALL
-FPDF_InitLibraryWithConfig(const FPDF_LIBRARY_CONFIG* cfg) {
+DLLEXPORT void STDCALL FPDF_InitLibraryWithConfig(
+ const FPDF_LIBRARY_CONFIG* cfg) {
g_pCodecModule = new CCodec_ModuleMgr();
CFX_GEModule::Create(cfg ? cfg->m_pUserFontPaths : nullptr);
@@ -852,9 +852,8 @@ void FPDF_RenderPage_Retail(CRenderContext* pContext,
pContext->m_pRenderer = new CPDF_ProgressiveRenderer(
pContext->m_pContext, pContext->m_pDevice, pContext->m_pOptions);
pContext->m_pRenderer->Start(pause);
- if (bNeedToRestore) {
+ if (bNeedToRestore)
pContext->m_pDevice->RestoreState();
- }
}
DLLEXPORT int STDCALL FPDF_GetPageSizeByIndex(FPDF_DOCUMENT document,
diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp
index f34db5cacc..bf0993bd4b 100644
--- a/fpdfsdk/src/fsdk_annothandler.cpp
+++ b/fpdfsdk/src/fsdk_annothandler.cpp
@@ -121,9 +121,9 @@ IPDFSDK_AnnotHandler* CPDFSDK_AnnotHandlerMgr::GetAnnotHandler(
CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
if (pPDFAnnot)
return GetAnnotHandler(pPDFAnnot->GetSubType());
- else if (pAnnot->GetXFAWidget())
+ if (pAnnot->GetXFAWidget())
return GetAnnotHandler(FSDK_XFAWIDGET_TYPENAME);
- return NULL;
+ return nullptr;
}
IPDFSDK_AnnotHandler* CPDFSDK_AnnotHandlerMgr::GetAnnotHandler(
diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp
index 8b083e3bea..ccb20ba8e9 100644
--- a/fpdfsdk/src/fsdk_baseannot.cpp
+++ b/fpdfsdk/src/fsdk_baseannot.cpp
@@ -878,8 +878,6 @@ void CPDFSDK_BAAnnot::WriteAppearance(const CFX_ByteString& sAPType,
CPDF_Document* pDoc = m_pPageView->GetPDFDocument();
int32_t objnum = pDoc->AddIndirectObject(pStream);
- // pAPDict->SetAtReference(sAPType, pDoc, objnum);
- ASSERT(pParentDict != NULL);
pParentDict->SetAtReference(sAPType, pDoc, objnum);
}
diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp
index a8da302700..003820aec1 100644
--- a/fpdfsdk/src/javascript/Document.cpp
+++ b/fpdfsdk/src/javascript/Document.cpp
@@ -779,8 +779,6 @@ FX_BOOL Document::mailDoc(IJS_Context* cc,
FX_BOOL Document::author(IJS_Context* cc,
CJS_PropValue& vp,
CFX_WideString& sError) {
- ASSERT(m_pDocument != NULL);
-
CPDF_Dictionary* pDictionary =
m_pDocument->GetDocument()->GetPDFDoc()->GetInfo();
if (!pDictionary)
@@ -804,8 +802,6 @@ FX_BOOL Document::author(IJS_Context* cc,
FX_BOOL Document::info(IJS_Context* cc,
CJS_PropValue& vp,
CFX_WideString& sError) {
- ASSERT(m_pDocument != NULL);
-
CPDF_Dictionary* pDictionary =
m_pDocument->GetDocument()->GetPDFDoc()->GetInfo();
if (!pDictionary)
diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp
index 8f705d51fa..ac6e99d1cd 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.cpp
+++ b/fpdfsdk/src/javascript/JS_Runtime.cpp
@@ -29,9 +29,6 @@
#include "report.h"
#include "util.h"
-/* ------------------------------ CJS_Runtime ------------------------------ */
-v8::Global<v8::ObjectTemplate>& _getGlobalObjectTemplate(v8::Isolate* pIsolate);
-
// static
void IJS_Runtime::Initialize(unsigned int slot, void* isolate) {
FXJS_Initialize(slot, reinterpret_cast<v8::Isolate*>(isolate));
@@ -96,8 +93,7 @@ CJS_Runtime::~CJS_Runtime() {
for (auto* obs : m_observers)
obs->OnDestroyed();
- int size = m_ContextArray.GetSize();
- for (int i = 0; i < size; i++)
+ for (int i = 0; i < m_ContextArray.GetSize(); i++)
delete m_ContextArray.GetAt(i);
m_ContextArray.RemoveAll();
@@ -108,7 +104,6 @@ CJS_Runtime::~CJS_Runtime() {
if (m_isolateManaged)
m_isolate->Dispose();
- m_isolate = NULL;
}
void CJS_Runtime::DefineJSObjects() {
diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp
index 75327dd631..094f3e7dd7 100644
--- a/fpdfsdk/src/javascript/PublicMethods.cpp
+++ b/fpdfsdk/src/javascript/PublicMethods.cpp
@@ -62,10 +62,18 @@ static const FX_WCHAR* const months[] = {L"Jan",
L"Nov",
L"Dec"};
-static const FX_WCHAR* const fullmonths[] = {
- L"January", L"February", L"March", L"April",
- L"May", L"June", L"July", L"August",
- L"September", L"October", L"November", L"December"};
+static const FX_WCHAR* const fullmonths[] = {L"January",
+ L"February",
+ L"March",
+ L"April",
+ L"May",
+ L"June",
+ L"July",
+ L"August",
+ L"September",
+ L"October",
+ L"November",
+ L"December"};
FX_BOOL CJS_PublicMethods::IsNumber(const FX_WCHAR* string) {
CFX_WideString sTrim = StrTrim(string);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 10:55:12 +0000