summaryrefslogtreecommitdiff
path: root/fpdfsdk/src
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk/src')
-rw-r--r--fpdfsdk/src/formfiller/FFL_Utils.cpp2
-rw-r--r--fpdfsdk/src/fpdfppo.cpp5
-rw-r--r--fpdfsdk/src/javascript/Document.cpp11
3 files changed, 7 insertions, 11 deletions
diff --git a/fpdfsdk/src/formfiller/FFL_Utils.cpp b/fpdfsdk/src/formfiller/FFL_Utils.cpp
index e3c8306a0a..3c1edc8455 100644
--- a/fpdfsdk/src/formfiller/FFL_Utils.cpp
+++ b/fpdfsdk/src/formfiller/FFL_Utils.cpp
@@ -84,7 +84,7 @@ FX_BOOL CFFL_Utils::TraceObject(CPDF_Object* pObj) {
// TRACE(pObj->AsString()->GetString() + "\n");
break;
case PDFOBJ_NAME:
- // TRACE(((CPDF_Name*)pObj)->GetString() + "\n");
+ // TRACE(pObj->AsName()->GetString() + "\n");
break;
case PDFOBJ_NULL:
// case PDFOBJ_KEYWORD:
diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp
index 6521258485..c37ecca490 100644
--- a/fpdfsdk/src/fpdfppo.cpp
+++ b/fpdfsdk/src/fpdfppo.cpp
@@ -186,9 +186,8 @@ CPDF_Object* CPDF_PageOrganizer::PageDictGetInheritableTag(
return NULL;
CPDF_Object* pType = pDict->GetElement("Type")->GetDirect();
- if (!pType || pType->GetType() != PDFOBJ_NAME)
- return NULL;
-
+ if (!ToName(pType))
+ return nullptr;
if (pType->GetString().Compare("Page"))
return NULL;
if (!pDict->KeyExist("Parent"))
diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp
index f69a39816f..a51a7a69db 100644
--- a/fpdfsdk/src/javascript/Document.cpp
+++ b/fpdfsdk/src/javascript/Document.cpp
@@ -850,17 +850,14 @@ FX_BOOL Document::info(IJS_Context* cc,
CFX_ByteString bsKey;
CPDF_Object* pValueObj = pDictionary->GetNextElement(pos, bsKey);
CFX_WideString wsKey = CFX_WideString::FromUTF8(bsKey, bsKey.GetLength());
- if (pValueObj->IsString() || (pValueObj->GetType() == PDFOBJ_NAME)) {
+
+ if (pValueObj->IsString() || pValueObj->IsName()) {
FXJS_PutObjectString(isolate, pObj, wsKey.c_str(),
pValueObj->GetUnicodeText().c_str());
- }
-
- if (pValueObj->IsNumber()) {
+ } else if (pValueObj->IsNumber()) {
FXJS_PutObjectNumber(isolate, pObj, wsKey.c_str(),
(float)pValueObj->GetNumber());
- }
-
- if (pValueObj->IsBoolean()) {
+ } else if (pValueObj->IsBoolean()) {
FXJS_PutObjectBoolean(isolate, pObj, wsKey.c_str(),
(bool)pValueObj->GetInteger());
}