Merge to XFA: Add type cast definitions for CPDF_Stream.

core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp

Index: core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp
index 9cdf00e717d2d2bb5c7ba62090867a3170dce1ec..06e2d2c18747fcb5e222ef64ec5334f3a08bb312 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp
@@ -45,15 +45,14 @@ void CPDF_Image::Release() {
   }
 }
 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) {