Merge to XFA: Add type cast definitions for CPDF_Stream.

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 27 matching lines @@
   m_Left = m_Bottom = 0;
   m_Right = m_Top = 1.0f;
   m_Matrix.TransformRect(m_Left, m_Right, m_Top, m_Bottom);
 }
 void CPDF_Image::Release() {
   if (m_bInline || (m_pStream && m_pStream->GetObjNum() == 0)) {
     delete this;
   }
 }
 CPDF_Image* CPDF_Image::Clone() {
-  if (m_pStream->GetObjNum()) {
+  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) {
+  pImage->LoadImageF(ToStream(m_pStream->CPDF_Object::Clone()), m_bInline);

[dsinclair, 2015/10/22 19:54:50]

There is a Clone() override in CPDF_Stream which causes the compiler to not be
happy. Had to force this to use CPDF_Object::Clone.

+  if (m_bInline)
     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;
   m_pMask = NULL;
@@ skipping 21 matching lines @@
     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;
 }