Add type cast definitions for CPDF_Name.

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
 int CPDF_Object::s_nCurRefDepth = 0;
 
 void CPDF_Object::Release() {
   if (m_ObjNum) {
     return;
   }
   Destroy();
 }
 void CPDF_Object::Destroy() {
   switch (m_Type) {
     case PDFOBJ_STRING:
       delete (CPDF_String*)this;
       break;
     case PDFOBJ_NAME:
-      delete (CPDF_Name*)this;
+      delete AsName();
       break;
     case PDFOBJ_ARRAY:
       delete (CPDF_Array*)this;
       break;
     case PDFOBJ_DICTIONARY:
       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 AsNumber()->GetString();
     case PDFOBJ_STRING:
       return ((CPDF_String*)this)->m_String;
     case PDFOBJ_NAME:
-      return ((CPDF_Name*)this)->m_Name;
+      return AsName()->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->GetRefObjNum());
       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_NAME: {
+      const CPDF_Name* pName = AsName();
+      return CFX_ByteStringC((const uint8_t*)pName->m_Name,
+                             pName->m_Name.GetLength());

[Tom Sepez, 2015/10/21 17:26:18]

nit: same comment as thestig in last cl about maybe making a local to hold
->m_Name.

[dsinclair, 2015/10/21 17:52:41]

Done.

+    }
     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 CFX_ByteStringC();
       }
@@ skipping 87 matching lines @@
     case PDFOBJ_BOOLEAN:
       AsBoolean()->m_bValue = (str == FX_BSTRC("true"));
       return;
     case PDFOBJ_NUMBER:
       AsNumber()->SetString(str);
       return;
     case PDFOBJ_STRING:
       ((CPDF_String*)this)->m_String = str;
       return;
     case PDFOBJ_NAME:
-      ((CPDF_Name*)this)->m_Name = str;
+      AsName()->m_Name = str;
       return;
   }
   ASSERT(FALSE);
 }
 int CPDF_Object::GetDirectType() const {
   if (m_Type != PDFOBJ_REFERENCE) {
     return m_Type;
   }
   CPDF_Reference* pRef = (CPDF_Reference*)this;
   return pRef->m_pObjList->GetIndirectType(pRef->GetRefObjNum());
@@ skipping 15 matching lines @@
     return FALSE;
   }
   switch (m_Type) {
     case PDFOBJ_BOOLEAN:
       return AsBoolean()->Identical(pOther->AsBoolean());
     case PDFOBJ_NUMBER:
       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));
+      return AsName()->Identical(pOther->AsName());
     case PDFOBJ_ARRAY:
       return (((CPDF_Array*)this)->Identical((CPDF_Array*)pOther));
     case PDFOBJ_DICTIONARY:
       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));
@@ skipping 21 matching lines @@
       return new CPDF_Boolean(AsBoolean()->m_bValue);
     case PDFOBJ_NUMBER: {
       const CPDF_Number* pThis = AsNumber();
       return new CPDF_Number(pThis->m_bInteger ? pThis->m_Integer
                                                : 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);
+      return new CPDF_Name(AsName()->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;
     }
@@ skipping 48 matching lines @@
   if (m_Type == PDFOBJ_STRING) {
     return PDF_DecodeText(((CPDF_String*)this)->m_String, pCharMap);
   }
   if (m_Type == PDFOBJ_STREAM) {
     CPDF_StreamAcc stream;
     stream.LoadAllData((CPDF_Stream*)this, FALSE);
     CFX_WideString result =
         PDF_DecodeText(stream.GetData(), stream.GetSize(), pCharMap);
     return result;
   }
-  if (m_Type == PDFOBJ_NAME) {
-    return PDF_DecodeText(((CPDF_Name*)this)->m_Name, pCharMap);
-  }
-  return CFX_WideString();
+

[Tom Sepez, 2015/10/21 17:26:17]

nit: I might have not opted for the ? operator here for parallelism with the
above |if|s.  we're going to have a bunch of statements of the form
   if (CPDF_Mumble* pMumble = AsMumble()) { 
      return pMumble->Fribits();
   }
   ...
   return CFX_Widestring();

[dsinclair, 2015/10/21 17:52:41]

Done.

+  const CPDF_Name* pName = AsName();
+  return pName ? PDF_DecodeText(pName->m_Name, pCharMap) : CFX_WideString();
 }
 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);
   }
 }
 
 CPDF_Boolean* CPDF_Object::AsBoolean() {
   return IsBoolean() ? static_cast<CPDF_Boolean*>(this) : nullptr;
 }
 
 const CPDF_Boolean* CPDF_Object::AsBoolean() const {
   return IsBoolean() ? static_cast<const CPDF_Boolean*>(this) : nullptr;
 }
 
 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_Name* CPDF_Object::AsName() {
+  return IsName() ? static_cast<CPDF_Name*>(this) : nullptr;
+}
+
+const CPDF_Name* CPDF_Object::AsName() const {
+  return IsName() ? static_cast<const CPDF_Name*>(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) {}
@@ skipping 852 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;
 }