Make CPDF_Object::GetString() a virtual method.

core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../../include/fpdfapi/fpdf_parser.h"
 #include "../../../include/fxcrt/fx_string.h"
 
 //static
@@ skipping 21 matching lines @@
         case PDFOBJ_DICTIONARY:
             delete (CPDF_Dictionary*)this;
             break;
         case PDFOBJ_STREAM:
             delete (CPDF_Stream*)this;
             break;
         default:
             delete this;
     }
 }
+
 CFX_ByteString CPDF_Object::GetString() const
 {
-    switch (m_Type) {
-        case PDFOBJ_BOOLEAN:
-            return ((CPDF_Boolean*)this)->m_bValue ? "true" : "false";
-        case PDFOBJ_NUMBER:
-            return ((CPDF_Number*)this)->GetString();
-        case PDFOBJ_STRING:
-            return ((CPDF_String*)this)->m_String;
-        case PDFOBJ_NAME:
-            return ((CPDF_Name*)this)->m_Name;
-        case PDFOBJ_REFERENCE: {
-                CPDF_Reference* pRef = (CPDF_Reference*)(void*)this;
-                if (pRef->m_pObjList == NULL) {
-                    break;
-                }
-                CPDF_Object* pObj = pRef->m_pObjList->GetIndirectObject(pRef->m_RefObjNum);
-                if (pObj == NULL) {
-                    return CFX_ByteString();
-                }
-                return pObj->GetString();
-            }
-    }
     return CFX_ByteString();
 }
+
 CFX_ByteStringC CPDF_Object::GetConstString() const
 {
     switch (m_Type) {
         case PDFOBJ_STRING:
             return CFX_ByteStringC((const uint8_t*)((CPDF_String*)this)->m_String, ((CPDF_String*)this)->m_String.GetLength());
         case PDFOBJ_NAME:
             return CFX_ByteStringC((const uint8_t*)((CPDF_Name*)this)->m_Name, ((CPDF_Name*)this)->m_Name.GetLength());
         case PDFOBJ_REFERENCE: {
                 CPDF_Reference* pRef = (CPDF_Reference*)(void*)this;
                 if (pRef->m_pObjList == NULL) {
@@ skipping 257 matching lines @@
 void CPDF_Object::SetUnicodeText(const FX_WCHAR* pUnicodes, int len)
 {
     if (m_Type == PDFOBJ_STRING) {
         ((CPDF_String*)this)->m_String = PDF_EncodeText(pUnicodes, len);
     } else if (m_Type == PDFOBJ_STREAM) {
         CFX_ByteString result = PDF_EncodeText(pUnicodes, len);
         ((CPDF_Stream*)this)->SetData((uint8_t*)result.c_str(), result.GetLength(), FALSE, FALSE);
     }
 }
 
+CFX_ByteString CPDF_Boolean::GetString() const
+{
+    return m_bValue ? "true" : "false";
+}
+
 CPDF_Number::CPDF_Number(int value)
     : CPDF_Object(PDFOBJ_NUMBER), m_bInteger(TRUE), m_Integer(value) {
 }
 
 CPDF_Number::CPDF_Number(FX_FLOAT value)
     : CPDF_Object(PDFOBJ_NUMBER), m_bInteger(FALSE), m_Float(value) {
 }
 
 CPDF_Number::CPDF_Number(FX_BOOL bInteger, void* pData)
     : CPDF_Object(PDFOBJ_NUMBER), m_bInteger(bInteger), m_Integer(*(int*)pData) {
@@ skipping 16 matching lines @@
     return m_bInteger ? CFX_ByteString::FormatInteger(m_Integer, FXFORMAT_SIGNED) : CFX_ByteString::FormatFloat(m_Float);
 }
 void CPDF_Number::SetNumber(FX_FLOAT value)
 {
     m_bInteger = FALSE;
     m_Float = value;
 }
 CPDF_String::CPDF_String(const CFX_WideString& str) : CPDF_Object(PDFOBJ_STRING), m_bHex(FALSE) {
     m_String = PDF_EncodeText(str);
 }
+
+CFX_ByteString CPDF_String::GetString() const
+{
+    return m_String;
+}
+
+CFX_ByteString CPDF_Name::GetString() const
+{
+    return m_Name;
+}
+
 CPDF_Array::~CPDF_Array()
 {
     int size = m_Objects.GetSize();
     CPDF_Object** pList = (CPDF_Object**)m_Objects.GetData();
     for (int i = 0; i < size; i ++) {
         if (pList[i])
             pList[i]->Release();
     }
 }
 CFX_FloatRect CPDF_Array::GetRect()
@@ skipping 22 matching lines @@
     if (i >= (FX_DWORD)m_Objects.GetSize()) {
         return NULL;
     }
     return (CPDF_Object*)m_Objects.GetAt(i);
 }
 CPDF_Object* CPDF_Array::GetElementValue(FX_DWORD i) const
 {
     if (i >= (FX_DWORD)m_Objects.GetSize()) {
         return NULL;
     }
     return ((CPDF_Object*)m_Objects.GetAt(i))->GetDirect();

[Tom Sepez, 2015/07/16 20:24:46]

Given that m_Objects is of type CFX_PtrArray, and that CFX_PtrArray is
a typedef for CFX_ArrayTemplate<void*>, might it make sense to make 
m_Objects be CFX_ArrayTemplate<CPDF_Object*>, and lose all these casts?  Your
call as to now, later, never.

 }
-CFX_ByteString CPDF_Array::GetString(FX_DWORD i) const
+CFX_ByteString CPDF_Array::GetStringAt(FX_DWORD i) const
 {
     if (i < (FX_DWORD)m_Objects.GetSize()) {
         CPDF_Object* p = (CPDF_Object*)m_Objects.GetAt(i);

[Tom Sepez, 2015/07/16 20:24:46]

nit: I'd really like this block to be a one-liner, once the cast is gone, of the
form:
  return m_Objects.GetAt(i)->GetString();

         return p->GetString();
     }
-    else
-        return CFX_ByteString();
+    return CFX_ByteString();
 }
 CFX_ByteStringC CPDF_Array::GetConstString(FX_DWORD i) const
 {
     if (i < (FX_DWORD)m_Objects.GetSize()) {
         CPDF_Object* p = (CPDF_Object*)m_Objects.GetAt(i);
         return p->GetConstString();
     }
-    else
-        return CFX_ByteStringC();
+    return CFX_ByteStringC();
 }
 int CPDF_Array::GetInteger(FX_DWORD i) const
 {
     if (i >= (FX_DWORD)m_Objects.GetSize()) {
         return 0;
     }
     CPDF_Object* p = (CPDF_Object*)m_Objects.GetAt(i);
     return p->GetInteger();
 }
 FX_FLOAT CPDF_Array::GetNumber(FX_DWORD i) const
@@ skipping 108 matching lines @@
 {
     if (m_Objects.GetSize() != pOther->m_Objects.GetSize()) {
         return FALSE;
     }
     for (int i = 0; i < m_Objects.GetSize(); i ++)
         if (!((CPDF_Object*)m_Objects[i])->IsIdentical((CPDF_Object*)pOther->m_Objects[i])) {
             return FALSE;
         }
     return TRUE;
 }
+
 CPDF_Dictionary::~CPDF_Dictionary()
 {
     FX_POSITION pos = m_Map.GetStartPosition();
     while (pos) {
         void* value = m_Map.GetNextValue(pos);
         if (value)
             ((CPDF_Object*)value)->Release();
     }
 }
 FX_POSITION CPDF_Dictionary::GetStartPos() const
@@ skipping 14 matching lines @@
     CPDF_Object* p = NULL;
     m_Map.Lookup(key, (void*&)p);
     return p;
 }
 CPDF_Object* CPDF_Dictionary::GetElementValue(const CFX_ByteStringC& key) const
 {
     CPDF_Object* p = NULL;
     m_Map.Lookup(key, (void*&)p);
     return p ? p->GetDirect() : NULL;
 }
-CFX_ByteString CPDF_Dictionary::GetString(const CFX_ByteStringC& key) const
+CFX_ByteString CPDF_Dictionary::GetStringAt(const CFX_ByteStringC& key) const
 {
     CPDF_Object* p = NULL;
     m_Map.Lookup(key, (void*&)p);
     if (p)
         return p->GetString();
     else

[Tom Sepez, 2015/07/16 20:24:46]

nit: else after return.  

         return CFX_ByteString();
 }
 CFX_ByteStringC CPDF_Dictionary::GetConstString(const CFX_ByteStringC& key) const
 {
     CPDF_Object* p = NULL;
     m_Map.Lookup(key, (void*&)p);
     if (p)
         return p->GetConstString();
     else
         return CFX_ByteStringC();
 }
 CFX_WideString CPDF_Dictionary::GetUnicodeText(const CFX_ByteStringC& key, CFX_CharMap* pCharMap) const
 {
     CPDF_Object* p = NULL;
     m_Map.Lookup(key, (void*&)p);
     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
+CFX_ByteString CPDF_Dictionary::GetStringAt(const CFX_ByteStringC& key,
+                                            const CFX_ByteStringC& def) const
 {
     CPDF_Object* p = NULL;
     m_Map.Lookup(key, (void*&)p);
     if (p) {
         return p->GetString();
     }
     return CFX_ByteString(def);
 }
 CFX_ByteStringC CPDF_Dictionary::GetConstString(const CFX_ByteStringC& key, const CFX_ByteStringC& def) const
 {
@@ skipping 202 matching lines @@
 {
     CPDF_Array* pArray = new CPDF_Array;
     pArray->AddNumber16(matrix.a);
     pArray->AddNumber16(matrix.b);
     pArray->AddNumber16(matrix.c);
     pArray->AddNumber16(matrix.d);
     pArray->AddNumber(matrix.e);
     pArray->AddNumber(matrix.f);
     SetAt(key, pArray);
 }
+
 CPDF_Stream::CPDF_Stream(uint8_t* pData, FX_DWORD size, CPDF_Dictionary* pDict)
     : CPDF_Object(PDFOBJ_STREAM) {
     m_pDict = pDict;
     m_dwSize = size;
     m_GenNum = (FX_DWORD) - 1;
     m_pDataBuf = pData;
     m_pCryptoHandler = NULL;
 }
 CPDF_Stream::~CPDF_Stream()
 {
@@ skipping 250 matching lines @@
     }
     if (pSrcData != pStream->m_pDataBuf && pSrcData != m_pData) {
         FX_Free(pSrcData);
     }
     if (pDecryptedData != pSrcData && pDecryptedData != m_pData) {
         FX_Free(pDecryptedData);
     }
     m_pSrcData = NULL;
     m_bNewBuf = m_pData != pStream->m_pDataBuf;
 }
+
 CPDF_StreamAcc::~CPDF_StreamAcc()
 {
     if (m_bNewBuf && m_pData) {
         FX_Free(m_pData);
     }
     if (m_pSrcData) {
         FX_Free(m_pSrcData);
     }
 }
 const uint8_t* CPDF_StreamAcc::GetData() const
@@ skipping 26 matching lines @@
     }
     uint8_t* p = FX_Alloc(uint8_t, m_dwSize);
     FXSYS_memcpy(p, m_pData, m_dwSize);
     return p;
 }
 void CPDF_Reference::SetRef(CPDF_IndirectObjects* pDoc, FX_DWORD objnum)
 {
     m_pObjList = pDoc;
     m_RefObjNum = objnum;
 }
+
+CFX_ByteString CPDF_Reference::GetString() const
+{
+    if (m_pObjList) {
+        CPDF_Object* pObj = m_pObjList->GetIndirectObject(m_RefObjNum);
+        if (pObj)
+            return pObj->GetString();
+    }
+    return CFX_ByteString();
+}
+
 CPDF_IndirectObjects::CPDF_IndirectObjects(CPDF_Parser* pParser)
 {
     m_pParser = pParser;
     m_IndirectObjs.InitHashTable(1013);
     if (pParser) {
         m_LastObjNum = m_pParser->GetLastObjNum();
     } else {
         m_LastObjNum = 0;
     }
 }
@@ skipping 94 matching lines @@
     pObj->m_ObjNum = objnum;
     m_IndirectObjs.SetAt((void*)(uintptr_t)objnum, pObj);
     if (m_LastObjNum < objnum) {
         m_LastObjNum = objnum;
     }
 }
 FX_DWORD CPDF_IndirectObjects::GetLastObjNum() const
 {
     return m_LastObjNum;
 }