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

fpdfsdk/src/fpdf_flatten.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 "../../public/fpdf_flatten.h"
 #include "../include/fsdk_define.h"
 
 typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray;
@@ skipping 76 matching lines @@
   if (!pSourceDoc || !pPageDic)
     return FLATTEN_FAIL;
 
   GetContentsRect(pSourceDoc, pPageDic, pRectArray);
   CPDF_Array* pAnnots = pPageDic->GetArray("Annots");
   if (!pAnnots)
     return FLATTEN_NOTHINGTODO;
 
   FX_DWORD dwSize = pAnnots->GetCount();
   for (int i = 0; i < (int)dwSize; i++) {
-    CPDF_Object* pObj = pAnnots->GetElementValue(i);
-    if (!pObj || pObj->GetType() != PDFOBJ_DICTIONARY)
+    CPDF_Dictionary* pAnnotDic = ToDictionary(pAnnots->GetElementValue(i));
+    if (!pAnnotDic)
       continue;
 
-    CPDF_Dictionary* pAnnotDic = (CPDF_Dictionary*)pObj;
     CFX_ByteString sSubtype = pAnnotDic->GetString("Subtype");
     if (sSubtype == "Popup")
       continue;
 
     int nAnnotFlag = pAnnotDic->GetInteger("F");
     if (nAnnotFlag & ANNOTFLAG_HIDDEN)
       continue;
 
     if (nUsage == FLAT_NORMALDISPLAY) {
       if (nAnnotFlag & ANNOTFLAG_INVISIBLE)
@@ skipping 405 matching lines @@
     pNewXObject->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE,
                          FALSE);
   }
   pPageDict->RemoveAt("Annots");
 
   ObjectArray.RemoveAll();
   RectArray.RemoveAll();
 
   return FLATTEN_SUCCESS;
 }