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

core/src/fpdfapi/fpdf_page/fpdf_page_image.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_page.h"
 #include "../../../include/fpdfapi/fpdf_pageobj.h"
 #include "pageint.h"
 CPDF_ImageObject::CPDF_ImageObject() {
@@ skipping 34 matching lines @@
   }
 }
 CPDF_Image* CPDF_Image::Clone() {
   if (m_pStream->GetObjNum()) {
     return m_pDocument->GetPageData()->GetImage(m_pStream);
   }
   CPDF_Image* pImage = new CPDF_Image(m_pDocument);
   pImage->LoadImageF((CPDF_Stream*)((CPDF_Object*)m_pStream)->Clone(),
                      m_bInline);
   if (m_bInline) {
-    CPDF_Dictionary* pInlineDict = (CPDF_Dictionary*)m_pInlineDict->Clone(TRUE);
-    pImage->SetInlineDict(pInlineDict);
+    pImage->SetInlineDict(ToDictionary(m_pInlineDict->Clone(TRUE)));
   }
   return pImage;
 }
 CPDF_Image::CPDF_Image(CPDF_Document* pDoc) {
   m_pDocument = pDoc;
   m_pStream = NULL;
   m_pOC = NULL;
   m_bInline = FALSE;
   m_pInlineDict = NULL;
   m_pDIBSource = NULL;
@@ skipping 12 matching lines @@
 }
 FX_BOOL CPDF_Image::LoadImageF(CPDF_Stream* pStream, FX_BOOL bInline) {
   m_pStream = pStream;
   if (m_bInline && m_pInlineDict) {
     m_pInlineDict->Release();
     m_pInlineDict = NULL;
   }
   m_bInline = bInline;
   CPDF_Dictionary* pDict = pStream->GetDict();
   if (m_bInline) {
-    m_pInlineDict = (CPDF_Dictionary*)pDict->Clone();
+    m_pInlineDict = ToDictionary(pDict->Clone());
   }
   m_pOC = pDict->GetDict(FX_BSTRC("OC"));
   m_bIsMask = !pDict->KeyExist(FX_BSTRC("ColorSpace")) ||
               pDict->GetInteger(FX_BSTRC("ImageMask"));
   m_bInterpolate = pDict->GetInteger(FX_BSTRC("Interpolate"));
   m_Height = pDict->GetInteger(FX_BSTRC("Height"));
   m_Width = pDict->GetInteger(FX_BSTRC("Width"));
   return TRUE;
 }