Add type cast definitions for CPDF_Number.

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 10 matching lines @@
     case PDFOBJ_STRING:
       delete (CPDF_String*)this;
       break;
     case PDFOBJ_NAME:
       delete (CPDF_Name*)this;
       break;
     case PDFOBJ_ARRAY:
       delete (CPDF_Array*)this;
       break;
     case PDFOBJ_DICTIONARY:
-      delete this->AsDictionary();
+      delete AsDictionary();
       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 AsBoolean()->m_bValue ? "true" : "false";
     case PDFOBJ_NUMBER:
-      return ((CPDF_Number*)this)->GetString();
+      return AsNumber()->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 =
@@ skipping 25 matching lines @@
         return CFX_ByteStringC();
       }
       return pObj->GetConstString();
     }
   }
   return CFX_ByteStringC();
 }
 FX_FLOAT CPDF_Object::GetNumber() const {
   switch (m_Type) {
     case PDFOBJ_NUMBER:
-      return ((CPDF_Number*)this)->GetNumber();
+      return AsNumber()->GetNumber();
     case PDFOBJ_REFERENCE: {
       CPDF_Reference* pRef = (CPDF_Reference*)(void*)this;
       if (pRef->m_pObjList == NULL) {
         break;
       }
       CPDF_Object* pObj =
           pRef->m_pObjList->GetIndirectObject(pRef->GetRefObjNum());
       if (pObj == NULL) {
         return 0;
       }
       return pObj->GetNumber();
     }
   }
   return 0;
 }
 FX_FLOAT CPDF_Object::GetNumber16() const {
   return GetNumber();
 }
 int CPDF_Object::GetInteger() const {
   CFX_AutoRestorer<int> restorer(&s_nCurRefDepth);
   if (++s_nCurRefDepth > OBJECT_REF_MAX_DEPTH) {
     return 0;
   }
   switch (m_Type) {
     case PDFOBJ_BOOLEAN:
-      return this->AsBoolean()->m_bValue;
+      return AsBoolean()->m_bValue;
     case PDFOBJ_NUMBER:
-      return ((CPDF_Number*)this)->GetInteger();
+      return AsNumber()->GetInteger();
     case PDFOBJ_REFERENCE: {
       CPDF_Reference* pRef = (CPDF_Reference*)(void*)this;
       PARSE_CONTEXT context;
       FXSYS_memset(&context, 0, sizeof(PARSE_CONTEXT));
       if (pRef->m_pObjList == NULL) {
         return 0;
       }
       CPDF_Object* pObj =
           pRef->m_pObjList->GetIndirectObject(pRef->GetRefObjNum(), &context);
       if (pObj == NULL) {
         return 0;
       }
       return pObj->GetInteger();
     }
   }
   return 0;
 }
 
 CPDF_Dictionary* CPDF_Object::GetDict() const {
   switch (m_Type) {
     case PDFOBJ_DICTIONARY:
       // The method should be made non-const if we want to not be const.
       // See bug #234.
-      return const_cast<CPDF_Dictionary*>(this->AsDictionary());
+      return const_cast<CPDF_Dictionary*>(AsDictionary());
     case PDFOBJ_STREAM:
       return ((CPDF_Stream*)this)->GetDict();
     case PDFOBJ_REFERENCE: {
       CPDF_Reference* pRef = (CPDF_Reference*)this;
       CPDF_IndirectObjects* pIndirect = pRef->GetObjList();
       if (!pIndirect)
         return nullptr;
       CPDF_Object* pObj = pIndirect->GetIndirectObject(pRef->GetRefObjNum());
       if (!pObj || (pObj == this))
         return nullptr;
@@ skipping 10 matching lines @@
 
   return NULL;
 }
 void CPDF_Object::SetString(const CFX_ByteString& str) {
   ASSERT(this != NULL);
   switch (m_Type) {
     case PDFOBJ_BOOLEAN:
       AsBoolean()->m_bValue = (str == FX_BSTRC("true"));
       return;
     case PDFOBJ_NUMBER:
-      ((CPDF_Number*)this)->SetString(str);
+      AsNumber()->SetString(str);
       return;
     case PDFOBJ_STRING:
       ((CPDF_String*)this)->m_String = str;
       return;
     case PDFOBJ_NAME:
       ((CPDF_Name*)this)->m_Name = str;
       return;
   }
   ASSERT(FALSE);
 }
@@ skipping 15 matching lines @@
     if (m_Type == PDFOBJ_REFERENCE && GetDirect()) {
       return GetDirect()->IsIdentical(pOther);
     }
     if (pOther->m_Type == PDFOBJ_REFERENCE) {
       return IsIdentical(pOther->GetDirect());
     }
     return FALSE;
   }
   switch (m_Type) {
     case PDFOBJ_BOOLEAN:
-      return this->AsBoolean()->Identical(pOther->AsBoolean());
+      return AsBoolean()->Identical(pOther->AsBoolean());
     case PDFOBJ_NUMBER:
-      return (((CPDF_Number*)this)->Identical((CPDF_Number*)pOther));
+      return AsNumber()->Identical(pOther->AsNumber());
     case PDFOBJ_STRING:
       return (((CPDF_String*)this)->Identical((CPDF_String*)pOther));
     case PDFOBJ_NAME:
       return (((CPDF_Name*)this)->Identical((CPDF_Name*)pOther));
     case PDFOBJ_ARRAY:
       return (((CPDF_Array*)this)->Identical((CPDF_Array*)pOther));
     case PDFOBJ_DICTIONARY:
-      return this->AsDictionary()->Identical(pOther->AsDictionary());
+      return AsDictionary()->Identical(pOther->AsDictionary());
     case PDFOBJ_NULL:
       return TRUE;
     case PDFOBJ_STREAM:
       return (((CPDF_Stream*)this)->Identical((CPDF_Stream*)pOther));
     case PDFOBJ_REFERENCE:
       return (((CPDF_Reference*)this)->Identical((CPDF_Reference*)pOther));
   }
   return FALSE;
 }
 CPDF_Object* CPDF_Object::GetDirect() const {
   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 {
   CFX_MapPtrToPtr visited;
   return CloneInternal(bDirect, &visited);
 }
 CPDF_Object* CPDF_Object::CloneInternal(FX_BOOL bDirect,
                                         CFX_MapPtrToPtr* visited) const {
   switch (m_Type) {
     case PDFOBJ_BOOLEAN:
-      return new CPDF_Boolean(this->AsBoolean()->m_bValue);
-    case PDFOBJ_NUMBER:
-      if (((CPDF_Number*)this)->m_bInteger)
-        return new CPDF_Number(((CPDF_Number*)this)->m_Integer);
-      return new CPDF_Number(((CPDF_Number*)this)->m_Float);
+      return new CPDF_Boolean(AsBoolean()->m_bValue);
+    case PDFOBJ_NUMBER: {
+      const CPDF_Number* pThis = AsNumber();
+      if (pThis->m_bInteger)

[Lei Zhang, 2015/10/21 14:45:50]

Combine into one ctor call?

return new CPDF_Number(pThis->m_bInteger ? pThis->m_Integer : pThis->m_Float)

[dsinclair, 2015/10/21 15:00:11]

Done.

+        return new CPDF_Number(pThis->m_Integer);
+      return new CPDF_Number(pThis->m_Float);
+    }
     case PDFOBJ_STRING:
       return new CPDF_String(((CPDF_String*)this)->m_String,
                              ((CPDF_String*)this)->IsHex());
     case PDFOBJ_NAME:
       return new CPDF_Name(((CPDF_Name*)this)->m_Name);
     case PDFOBJ_ARRAY: {
       CPDF_Array* pCopy = new CPDF_Array();
       CPDF_Array* pThis = (CPDF_Array*)this;
       int n = pThis->GetCount();
       for (int i = 0; i < n; i++) {
         CPDF_Object* value = (CPDF_Object*)pThis->m_Objects.GetAt(i);
         pCopy->m_Objects.Add(value->CloneInternal(bDirect, visited));
       }
       return pCopy;
     }
     case PDFOBJ_DICTIONARY: {
       CPDF_Dictionary* pCopy = new CPDF_Dictionary();
-      const CPDF_Dictionary* pThis = this->AsDictionary();
+      const CPDF_Dictionary* pThis = AsDictionary();
       FX_POSITION pos = pThis->m_Map.GetStartPosition();
       while (pos) {
         CFX_ByteString key;
         CPDF_Object* value;
         pThis->m_Map.GetNextAssoc(pos, key, (void*&)value);
         pCopy->m_Map.SetAt(key, value->CloneInternal(bDirect, visited));
       }
       return pCopy;
     }
     case PDFOBJ_NULL: {
@@ skipping 66 matching lines @@
 }
 
 CPDF_Dictionary* CPDF_Object::AsDictionary() {
   return IsDictionary() ? static_cast<CPDF_Dictionary*>(this) : nullptr;
 }
 
 const CPDF_Dictionary* CPDF_Object::AsDictionary() const {
   return IsDictionary() ? static_cast<const CPDF_Dictionary*>(this) : nullptr;
 }
 
+CPDF_Number* CPDF_Object::AsNumber() {
+  return IsNumber() ? static_cast<CPDF_Number*>(this) : nullptr;
+}
+
+const CPDF_Number* CPDF_Object::AsNumber() const {
+  return IsNumber() ? static_cast<const CPDF_Number*>(this) : nullptr;
+}
+
 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(const CFX_ByteStringC& str)
     : CPDF_Object(PDFOBJ_NUMBER) {
   FX_atonum(str, m_bInteger, &m_Integer);
 }
@@ skipping 844 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;
 }