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

fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp

Index: fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp
diff --git a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp
index 3a8853cb24b3dfa2011b4bb76e55abe21b4b8e50..147a0588cce0b156d756d63845b5e74153c680a0 100644
--- a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp
+++ b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp
@@ -137,11 +137,9 @@ CPDF_Font* CBA_FontMap::FindResFontSameCharset(CPDF_Dictionary* pResDict,
     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;
 
@@ -181,7 +179,7 @@ void CBA_FontMap::AddFontToAnnotDict(CPDF_Font* pFont,
 
   // to avoid checkbox and radiobutton
   CPDF_Object* pObject = pAPDict->GetElement(m_sAPType);
-  if (pObject && pObject->GetType() == PDFOBJ_DICTIONARY)
+  if (ToDictionary(pObject))
     return;
 
   CPDF_Stream* pStream = pAPDict->GetStream(m_sAPType);