Revert "Revert "Add type cast definitions for CPDF_Dictionary.""

core/src/fpdfdoc/doc_utils.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/fpdfdoc/fpdf_doc.h"
 #include "doc_utils.h"
 
 static const int FPDFDOC_UTILS_MAXRECURSION = 32;
@@ skipping 272 matching lines @@
   }
   FX_DWORD dwCount = 0;
   FX_POSITION pos = pFonts->GetStartPos();
   while (pos) {
     CPDF_Object* pObj = NULL;
     CFX_ByteString csKey;
     pObj = pFonts->GetNextElement(pos, csKey);
     if (pObj == NULL) {
       continue;
     }
-    CPDF_Object* pDirect = pObj->GetDirect();
-    if (pDirect != NULL && pDirect->GetType() == PDFOBJ_DICTIONARY) {
-      if (((CPDF_Dictionary*)pDirect)->GetString("Type") == "Font") {
+    if (CPDF_Dictionary* pDirect = ToDictionary(pObj->GetDirect())) {
+      if (pDirect->GetString("Type") == "Font") {
         dwCount++;
       }
     }
   }
   return dwCount;
 }
 CPDF_Font* GetInterFormFont(CPDF_Dictionary* pFormDict,
                             CPDF_Document* pDocument,
                             FX_DWORD index,
                             CFX_ByteString& csNameTag) {
@@ skipping 10 matching lines @@
   }
   FX_DWORD dwCount = 0;
   FX_POSITION pos = pFonts->GetStartPos();
   while (pos) {
     CPDF_Object* pObj = NULL;
     CFX_ByteString csKey;
     pObj = pFonts->GetNextElement(pos, csKey);
     if (pObj == NULL) {
       continue;
     }
-    CPDF_Object* pDirect = pObj->GetDirect();
-    if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) {
+    CPDF_Dictionary* pElement = ToDictionary(pObj->GetDirect());
+    if (!pElement)
       continue;
-    }
-    CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
-    if (pElement->GetString("Type") != "Font") {
+    if (pElement->GetString("Type") != "Font")
       continue;
-    }
     if (dwCount == index) {
       csNameTag = csKey;
       return pDocument->LoadFont(pElement);
     }
     dwCount++;
   }
   return NULL;
 }
 CPDF_Font* GetInterFormFont(CPDF_Dictionary* pFormDict,
                             CPDF_Document* pDocument,
@@ skipping 35 matching lines @@
     return NULL;
   }
   FX_POSITION pos = pFonts->GetStartPos();
   while (pos) {
     CPDF_Object* pObj = NULL;
     CFX_ByteString csKey;
     pObj = pFonts->GetNextElement(pos, csKey);
     if (pObj == NULL) {
       continue;
     }
-    CPDF_Object* pDirect = pObj->GetDirect();
-    if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) {
+    CPDF_Dictionary* pElement = ToDictionary(pObj->GetDirect());
+    if (!pElement)
       continue;
-    }
-    CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
-    if (pElement->GetString("Type") != "Font") {
+    if (pElement->GetString("Type") != "Font")
       continue;
-    }
+
     CPDF_Font* pFind = pDocument->LoadFont(pElement);
-    if (pFind == NULL) {
+    if (!pFind)
       continue;
-    }
+
     CFX_ByteString csBaseFont;
     csBaseFont = pFind->GetBaseFont();
     csBaseFont.Remove(' ');
     if (csBaseFont == csFontName) {
       csNameTag = csKey;
       return pFind;
     }
   }
   return NULL;
 }
@@ skipping 13 matching lines @@
     return NULL;
   }
   FX_POSITION pos = pFonts->GetStartPos();
   while (pos) {
     CPDF_Object* pObj = NULL;
     CFX_ByteString csKey;
     pObj = pFonts->GetNextElement(pos, csKey);
     if (pObj == NULL) {
       continue;
     }
-    CPDF_Object* pDirect = pObj->GetDirect();
-    if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) {
+    CPDF_Dictionary* pElement = ToDictionary(pObj->GetDirect());
+    if (!pElement)
       continue;
-    }
-    CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
-    if (pElement->GetString("Type") != "Font") {
+    if (pElement->GetString("Type") != "Font")
       continue;
-    }
     CPDF_Font* pFind = pDocument->LoadFont(pElement);
     if (pFind == NULL) {
       continue;
     }
     CFX_SubstFont* pSubst = (CFX_SubstFont*)pFind->GetSubstFont();
     if (pSubst == NULL) {
       continue;
     }
     if (pSubst->m_Charset == (int)charSet) {
       csNameTag = csKey;
@@ skipping 33 matching lines @@
     return FALSE;
   }
   FX_POSITION pos = pFonts->GetStartPos();
   while (pos) {
     CPDF_Object* pObj = NULL;
     CFX_ByteString csKey;
     pObj = pFonts->GetNextElement(pos, csKey);
     if (pObj == NULL) {
       continue;
     }
-    CPDF_Object* pDirect = pObj->GetDirect();
-    if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) {
+    CPDF_Dictionary* pElement = ToDictionary(pObj->GetDirect());
+    if (!pElement)
       continue;
-    }
-    CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
     if (pElement->GetString("Type") != "Font") {
       continue;
     }
     if (pFont->GetFontDict() == pElement) {
       csNameTag = csKey;
       return TRUE;
     }
   }
   return FALSE;
 }
@@ skipping 17 matching lines @@
     csFontName.Remove(' ');
   }
   FX_POSITION pos = pFonts->GetStartPos();
   while (pos) {
     CPDF_Object* pObj = NULL;
     CFX_ByteString csKey, csTmp;
     pObj = pFonts->GetNextElement(pos, csKey);
     if (pObj == NULL) {
       continue;
     }
-    CPDF_Object* pDirect = pObj->GetDirect();
-    if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) {
+    CPDF_Dictionary* pElement = ToDictionary(pObj->GetDirect());
+    if (!pElement)
       continue;
-    }
-    CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
     if (pElement->GetString("Type") != "Font") {
       continue;
     }
     pFont = pDocument->LoadFont(pElement);
     if (pFont == NULL) {
       continue;
     }
     CFX_ByteString csBaseFont;
     csBaseFont = pFont->GetBaseFont();
     csBaseFont.Remove(' ');
@@ skipping 179 matching lines @@
   CPDF_Object* pAttr = pFieldDict->GetElementValue(name);
   if (pAttr) {
     return pAttr;
   }
   CPDF_Dictionary* pParent = pFieldDict->GetDict("Parent");
   if (pParent == NULL) {
     return NULL;
   }
   return FPDF_GetFieldAttr(pParent, name, nLevel + 1);
 }