[Merge to XFA] Revert "Revert "Add type cast definitions for CPDF_Dictionary.""

core/src/fpdfapi/fpdf_font/fpdf_font.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_module.h"
 #include "../../../include/fpdfapi/fpdf_page.h"
 #include "../../../include/fpdfapi/fpdf_pageobj.h"
 #include "../../../include/fpdfapi/fpdf_resource.h"
@@ skipping 727 matching lines @@
       }
       return;
     }
     CFX_ByteString bsEncoding = pEncoding->GetString();
     if (bsEncoding.Compare(FX_BSTRC("MacExpertEncoding")) == 0) {
       bsEncoding = FX_BSTRC("WinAnsiEncoding");
     }
     GetPredefinedEncoding(iBaseEncoding, bsEncoding);
     return;
   }
-  if (pEncoding->GetType() != PDFOBJ_DICTIONARY) {
+
+  CPDF_Dictionary* pDict = pEncoding->AsDictionary();
+  if (!pDict)
     return;
-  }
-  CPDF_Dictionary* pDict = (CPDF_Dictionary*)pEncoding;
+
   if (iBaseEncoding != PDFFONT_ENCODING_ADOBE_SYMBOL &&
       iBaseEncoding != PDFFONT_ENCODING_ZAPFDINGBATS) {
     CFX_ByteString bsEncoding = pDict->GetString(FX_BSTRC("BaseEncoding"));
     if (bsEncoding.Compare(FX_BSTRC("MacExpertEncoding")) == 0 && bTrueType) {
       bsEncoding = FX_BSTRC("WinAnsiEncoding");
     }
     GetPredefinedEncoding(iBaseEncoding, bsEncoding);
   }
   if ((!bEmbedded || bTrueType) && iBaseEncoding == PDFFONT_ENCODING_BUILTIN) {
     iBaseEncoding = PDFFONT_ENCODING_STANDARD;
@@ skipping 12 matching lines @@
     if (pElement->GetType() == PDFOBJ_NAME) {
       if (cur_code < 256) {
         pCharNames[cur_code] = ((CPDF_Name*)pElement)->GetString();
       }
       cur_code++;
     } else {
       cur_code = pElement->GetInteger();
     }
   }
 }
+
 FX_BOOL CPDF_Font::IsStandardFont() const {
   if (m_FontType != PDFFONT_TYPE1) {
     return FALSE;
   }
   if (m_pFontFile != NULL) {
     return FALSE;
   }
   if (((CPDF_Type1Font*)this)->GetBase14Font() < 0) {
     return FALSE;
   }
@@ skipping 987 matching lines @@
 CPDF_Type3Char::CPDF_Type3Char() {
   m_pForm = NULL;
   m_pBitmap = NULL;
   m_bPageRequired = FALSE;
   m_bColored = FALSE;
 }
 CPDF_Type3Char::~CPDF_Type3Char() {
   delete m_pForm;
   delete m_pBitmap;
 }