summaryrefslogtreecommitdiff
path: root/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp')
-rw-r--r--core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp107
1 files changed, 64 insertions, 43 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
index 07b1a208d7..fc473319fc 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
@@ -48,13 +48,16 @@ CFX_ByteString CPDF_Object::GetString() const {
case PDFOBJ_NAME:
return AsName()->m_Name;
case PDFOBJ_REFERENCE: {
- const CPDF_Reference* pRef = AsReference();
- if (!pRef->m_pObjList)
+ CPDF_Reference* pRef = (CPDF_Reference*)(void*)this;
+ if (pRef->m_pObjList == NULL) {
break;
-
+ }
CPDF_Object* pObj =
pRef->m_pObjList->GetIndirectObject(pRef->GetRefObjNum());
- return pObj ? pObj->GetString() : CFX_ByteString();
+ if (pObj == NULL) {
+ return CFX_ByteString();
+ }
+ return pObj->GetString();
}
}
return CFX_ByteString();
@@ -70,13 +73,16 @@ CFX_ByteStringC CPDF_Object::GetConstString() const {
return CFX_ByteStringC((const uint8_t*)name, name.GetLength());
}
case PDFOBJ_REFERENCE: {
- const CPDF_Reference* pRef = AsReference();
- if (!pRef->m_pObjList)
+ CPDF_Reference* pRef = (CPDF_Reference*)(void*)this;
+ if (pRef->m_pObjList == NULL) {
break;
-
+ }
CPDF_Object* pObj =
pRef->m_pObjList->GetIndirectObject(pRef->GetRefObjNum());
- return pObj ? pObj->GetConstString() : CFX_ByteStringC();
+ if (pObj == NULL) {
+ return CFX_ByteStringC();
+ }
+ return pObj->GetConstString();
}
}
return CFX_ByteStringC();
@@ -86,13 +92,16 @@ FX_FLOAT CPDF_Object::GetNumber() const {
case PDFOBJ_NUMBER:
return AsNumber()->GetNumber();
case PDFOBJ_REFERENCE: {
- const CPDF_Reference* pRef = AsReference();
- if (!pRef->m_pObjList)
+ CPDF_Reference* pRef = (CPDF_Reference*)(void*)this;
+ if (pRef->m_pObjList == NULL) {
break;
-
+ }
CPDF_Object* pObj =
pRef->m_pObjList->GetIndirectObject(pRef->GetRefObjNum());
- return pObj ? pObj->GetNumber() : 0;
+ if (pObj == NULL) {
+ return 0;
+ }
+ return pObj->GetNumber();
}
}
return 0;
@@ -111,15 +120,18 @@ int CPDF_Object::GetInteger() const {
case PDFOBJ_NUMBER:
return AsNumber()->GetInteger();
case PDFOBJ_REFERENCE: {
- const CPDF_Reference* pRef = AsReference();
+ CPDF_Reference* pRef = (CPDF_Reference*)(void*)this;
PARSE_CONTEXT context;
FXSYS_memset(&context, 0, sizeof(PARSE_CONTEXT));
- if (!pRef->m_pObjList)
+ if (pRef->m_pObjList == NULL) {
return 0;
-
+ }
CPDF_Object* pObj =
pRef->m_pObjList->GetIndirectObject(pRef->GetRefObjNum(), &context);
- return pObj ? pObj->GetInteger() : 0;
+ if (pObj == NULL) {
+ return 0;
+ }
+ return pObj->GetInteger();
}
}
return 0;
@@ -134,7 +146,7 @@ CPDF_Dictionary* CPDF_Object::GetDict() const {
case PDFOBJ_STREAM:
return AsStream()->GetDict();
case PDFOBJ_REFERENCE: {
- const CPDF_Reference* pRef = AsReference();
+ CPDF_Reference* pRef = (CPDF_Reference*)this;
CPDF_IndirectObjects* pIndirect = pRef->GetObjList();
if (!pIndirect)
return nullptr;
@@ -172,21 +184,26 @@ void CPDF_Object::SetString(const CFX_ByteString& str) {
ASSERT(FALSE);
}
int CPDF_Object::GetDirectType() const {
- const CPDF_Reference* pRef = AsReference();
- if (!pRef)
+ if (m_Type != PDFOBJ_REFERENCE) {
return m_Type;
+ }
+ CPDF_Reference* pRef = (CPDF_Reference*)this;
return pRef->m_pObjList->GetIndirectType(pRef->GetRefObjNum());
}
FX_BOOL CPDF_Object::IsIdentical(CPDF_Object* pOther) const {
- if (this == pOther)
+ if (this == pOther) {
return TRUE;
- if (!pOther)
+ }
+ if (pOther == NULL) {
return FALSE;
+ }
if (pOther->m_Type != m_Type) {
- if (IsReference() && GetDirect())
+ if (m_Type == PDFOBJ_REFERENCE && GetDirect()) {
return GetDirect()->IsIdentical(pOther);
- if (pOther->IsReference())
+ }
+ if (pOther->m_Type == PDFOBJ_REFERENCE) {
return IsIdentical(pOther->GetDirect());
+ }
return FALSE;
}
switch (m_Type) {
@@ -207,16 +224,18 @@ FX_BOOL CPDF_Object::IsIdentical(CPDF_Object* pOther) const {
case PDFOBJ_STREAM:
return AsStream()->Identical(pOther->AsStream());
case PDFOBJ_REFERENCE:
- return AsReference()->Identical(pOther->AsReference());
+ return (((CPDF_Reference*)this)->Identical((CPDF_Reference*)pOther));
}
return FALSE;
}
CPDF_Object* CPDF_Object::GetDirect() const {
- const CPDF_Reference* pRef = AsReference();
- if (!pRef)
- return const_cast<CPDF_Object*>(this);
- if (!pRef->m_pObjList)
- return nullptr;
+ if (m_Type != PDFOBJ_REFERENCE) {
+ return (CPDF_Object*)this;
+ }
+ CPDF_Reference* pRef = (CPDF_Reference*)(void*)this;
+ if (pRef->m_pObjList == NULL) {
+ return NULL;
+ }
return pRef->m_pObjList->GetIndirectObject(pRef->GetRefObjNum());
}
CPDF_Object* CPDF_Object::Clone(FX_BOOL bDirect) const {
@@ -276,7 +295,7 @@ CPDF_Object* CPDF_Object::CloneInternal(FX_BOOL bDirect,
return new CPDF_Stream(acc.DetachData(), streamSize, pDict);
}
case PDFOBJ_REFERENCE: {
- const CPDF_Reference* pRef = AsReference();
+ CPDF_Reference* pRef = (CPDF_Reference*)this;
FX_DWORD obj_num = pRef->GetRefObjNum();
if (bDirect && !visited->GetValueAt((void*)(uintptr_t)obj_num)) {
visited->SetAt((void*)(uintptr_t)obj_num, (void*)1);
@@ -361,14 +380,6 @@ const CPDF_Number* CPDF_Object::AsNumber() const {
return IsNumber() ? static_cast<const CPDF_Number*>(this) : nullptr;
}
-CPDF_Reference* CPDF_Object::AsReference() {
- return IsReference() ? static_cast<CPDF_Reference*>(this) : nullptr;
-}
-
-const CPDF_Reference* CPDF_Object::AsReference() const {
- return IsReference() ? static_cast<const CPDF_Reference*>(this) : nullptr;
-}
-
CPDF_Stream* CPDF_Object::AsStream() {
return IsStream() ? static_cast<CPDF_Stream*>(this) : nullptr;
}
@@ -628,9 +639,17 @@ CFX_WideString CPDF_Dictionary::GetUnicodeText(const CFX_ByteStringC& key,
CFX_CharMap* pCharMap) const {
CPDF_Object* p = NULL;
m_Map.Lookup(key, (void*&)p);
- if (CPDF_Reference* pRef = ToReference(p))
- p = pRef->GetDirect();
- return p ? p->GetUnicodeText(pCharMap) : CFX_WideString();
+ if (p) {
+ if (p->GetType() == PDFOBJ_REFERENCE) {
+ p = ((CPDF_Reference*)p)->GetDirect();
+ if (p) {
+ return p->GetUnicodeText(pCharMap);
+ }
+ } else {
+ return p->GetUnicodeText(pCharMap);
+ }
+ }
+ return CFX_WideString();
}
CFX_ByteString CPDF_Dictionary::GetString(const CFX_ByteStringC& key,
const CFX_ByteStringC& def) const {
@@ -702,15 +721,17 @@ CPDF_Stream* CPDF_Dictionary::GetStream(const CFX_ByteStringC& key) const {
CFX_FloatRect CPDF_Dictionary::GetRect(const CFX_ByteStringC& key) const {
CFX_FloatRect rect;
CPDF_Array* pArray = GetArray(key);
- if (pArray)
+ if (pArray) {
rect = pArray->GetRect();
+ }
return rect;
}
CFX_AffineMatrix CPDF_Dictionary::GetMatrix(const CFX_ByteStringC& key) const {
CFX_AffineMatrix matrix;
CPDF_Array* pArray = GetArray(key);
- if (pArray)
+ if (pArray) {
matrix = pArray->GetMatrix();
+ }
return matrix;
}
FX_BOOL CPDF_Dictionary::KeyExist(const CFX_ByteStringC& key) const {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 14:20:25 +0000