split CPDF_StreamContentParser::AddImage() into 3 overloads.

core/fpdfapi/page/fpdf_page_parser.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 "core/fpdfapi/page/pageint.h"
 
 #include <memory>
 #include <utility>
@@ skipping 602 matching lines @@
       CFX_ByteString name = pCSObj->GetString();
       if (name != "DeviceRGB" && name != "DeviceGray" && name != "DeviceCMYK") {
         pCSObj = FindResourceObj("ColorSpace", name);
         if (pCSObj && pCSObj->IsInline()) {
           pCSObj = pCSObj->Clone();
           pDict->SetFor("ColorSpace", pCSObj);
         }
       }
     }
   }
-  CPDF_Stream* pStream =
-      m_pSyntax->ReadInlineStream(m_pDocument, pDict, pCSObj);
+  pDict->SetNameFor("Subtype", "Image");
+  UniqueStream pStream(m_pSyntax->ReadInlineStream(m_pDocument, pDict, pCSObj));
+  bool bGaveDictAway = !!pStream;
   while (1) {
     CPDF_StreamParser::SyntaxType type = m_pSyntax->ParseNextElement();
     if (type == CPDF_StreamParser::EndOfData) {
       break;
     }
     if (type != CPDF_StreamParser::Keyword) {
       continue;
     }
     if (m_pSyntax->GetWordSize() == 2 && m_pSyntax->GetWordBuf()[0] == 'E' &&
         m_pSyntax->GetWordBuf()[1] == 'I') {
       break;
     }
   }
-  pDict->SetNameFor("Subtype", "Image");
-  CPDF_ImageObject* pImgObj = AddImage(pStream, nullptr, true);
-  if (!pImgObj) {
-    if (pStream) {
-      pStream->Release();
-    } else {
-      pDict->Release();
-    }
-  }
+  CPDF_ImageObject* pImgObj = AddImage(std::move(pStream));
+  if (!pImgObj && !bGaveDictAway)
+    pDict->Release();
 }
 
 void CPDF_StreamContentParser::Handle_BeginMarkedContent() {
   m_CurContentMark.AddMark(GetString(0), nullptr, FALSE);
 }
 
 void CPDF_StreamContentParser::Handle_BeginText() {
   m_pCurStates->m_TextMatrix.Set(1.0f, 0, 0, 1.0f, 0, 0);
   OnChangeTextMatrix();
   m_pCurStates->m_TextX = 0;
@@ skipping 50 matching lines @@
   for (int i = 0; i < 6; i++) {
     m_Type3Data[i] = GetNumber(5 - i);
   }
   m_bColored = false;
 }
 
 void CPDF_StreamContentParser::Handle_ExecuteXObject() {
   CFX_ByteString name = GetString(0);
   if (name == m_LastImageName && m_pLastImage && m_pLastImage->GetStream() &&
       m_pLastImage->GetStream()->GetObjNum()) {
-    AddImage(nullptr, m_pLastImage, false);
+    AddImage(m_pLastImage);
     return;
   }
 
   CPDF_Stream* pXObject = ToStream(FindResourceObj("XObject", name));
   if (!pXObject) {
     m_bResourceMissing = true;
     return;
   }
 
   CFX_ByteString type;
   if (pXObject->GetDict())
     type = pXObject->GetDict()->GetStringFor("Subtype");
 
   if (type == "Image") {
-    CPDF_ImageObject* pObj = AddImage(pXObject, nullptr, false);
+    CPDF_ImageObject* pObj = AddImage(pXObject->GetObjNum());
     m_LastImageName = name;
     m_pLastImage = pObj->GetImage();
     if (!m_pObjectHolder->HasImageMask())
       m_pObjectHolder->SetHasImageMask(m_pLastImage->IsMask());
   } else if (type == "Form") {
     AddForm(pXObject);
   }
 }
 
 void CPDF_StreamContentParser::AddForm(CPDF_Stream* pStream) {
@@ skipping 10 matching lines @@
   pFormObj->m_pForm->ParseContent(&status, nullptr, nullptr, m_Level + 1);
   if (!m_pObjectHolder->BackgroundAlphaNeeded() &&
       pFormObj->m_pForm->BackgroundAlphaNeeded()) {
     m_pObjectHolder->SetBackgroundAlphaNeeded(TRUE);
   }
   pFormObj->CalcBoundingBox();
   SetGraphicStates(pFormObj.get(), true, true, true);
   m_pObjectHolder->GetPageObjectList()->push_back(std::move(pFormObj));
 }
 
-CPDF_ImageObject* CPDF_StreamContentParser::AddImage(CPDF_Stream* pStream,
-                                                     CPDF_Image* pImage,
-                                                     bool bInline) {
-  if (!pStream && !pImage)
+CPDF_ImageObject* CPDF_StreamContentParser::AddImage(UniqueStream pStream) {
+  if (!pStream)
     return nullptr;
 
+  auto pImageObj = pdfium::MakeUnique<CPDF_ImageObject>();
+  pImageObj->SetOwnedImage(
+      pdfium::MakeUnique<CPDF_Image>(m_pDocument, pStream.release(), true));
+
+  return AddImageObject(std::move(pImageObj));
+}
+
+CPDF_ImageObject* CPDF_StreamContentParser::AddImage(uint32_t streamObjNum) {
+  CPDF_Stream* pStream = ToStream(m_pDocument->GetIndirectObject(streamObjNum));
+  if (!pStream)
+    return nullptr;
+
+  auto pImageObj = pdfium::MakeUnique<CPDF_ImageObject>();
+  pImageObj->SetUnownedImage(m_pDocument->LoadImageF(pStream));
+  return AddImageObject(std::move(pImageObj));
+}
+
+CPDF_ImageObject* CPDF_StreamContentParser::AddImage(CPDF_Image* pImage) {
+  if (!pImage)
+    return nullptr;
+
+  auto pImageObj = pdfium::MakeUnique<CPDF_ImageObject>();
+  pImageObj->SetUnownedImage(
+      m_pDocument->GetPageData()->GetImage(pImage->GetStream()));
+
+  return AddImageObject(std::move(pImageObj));
+}
+
+CPDF_ImageObject* CPDF_StreamContentParser::AddImageObject(
+    std::unique_ptr<CPDF_ImageObject> pImageObj) {
+  SetGraphicStates(pImageObj.get(), pImageObj->GetImage()->IsMask(), false,
+                   false);
+
   CFX_Matrix ImageMatrix = m_pCurStates->m_CTM;
   ImageMatrix.Concat(m_mtContentToUser);
-
-  std::unique_ptr<CPDF_ImageObject> pImageObj(new CPDF_ImageObject);
-  if (pImage) {
-    pImageObj->SetUnownedImage(
-        m_pDocument->GetPageData()->GetImage(pImage->GetStream()));
-  } else if (!pStream->IsInline()) {
-    pImageObj->SetUnownedImage(m_pDocument->LoadImageF(pStream));
-  } else {
-    pImageObj->SetOwnedImage(
-        pdfium::MakeUnique<CPDF_Image>(m_pDocument, pStream, bInline));
-  }
-  SetGraphicStates(pImageObj.get(), pImageObj->GetImage()->IsMask(), false,
-                   false);
   pImageObj->m_Matrix = ImageMatrix;
   pImageObj->CalcBoundingBox();
+
   CPDF_ImageObject* pRet = pImageObj.get();
   m_pObjectHolder->GetPageObjectList()->push_back(std::move(pImageObj));
   return pRet;
 }
 
 void CPDF_StreamContentParser::Handle_MarkPlace_Dictionary() {}
 
 void CPDF_StreamContentParser::Handle_EndImage() {}
 
 void CPDF_StreamContentParser::Handle_EndMarkedContent() {
@@ skipping 864 matching lines @@
         } else {
           PDF_ReplaceAbbr(pElement);
         }
       }
       break;
     }
     default:
       break;
   }
 }