split CPDF_StreamContentParser::AddImage() into 3 overloads.

core/fpdfapi/page/pageint.h

 // 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
 
 #ifndef CORE_FPDFAPI_PAGE_PAGEINT_H_
 #define CORE_FPDFAPI_PAGE_PAGEINT_H_
 
 #include <map>
 #include <memory>
 #include <set>
 #include <unordered_map>
 #include <vector>
 
 #include "core/fpdfapi/page/cpdf_contentmark.h"
 #include "core/fpdfapi/page/cpdf_countedobject.h"
 #include "core/fpdfapi/page/cpdf_pageobjectholder.h"
+#include "core/fpdfapi/parser/cpdf_stream.h"
 #include "core/fxcrt/cfx_string_pool_template.h"
 #include "core/fxcrt/cfx_weak_ptr.h"
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
 
 class CPDF_AllStates;
 class CPDF_ColorSpace;
 class CPDF_ExpIntFunc;
 class CPDF_Font;
 class CPDF_FontEncoding;
@@ skipping 107 matching lines @@
                      int count);
 
   void ConvertUserSpace(FX_FLOAT& x, FX_FLOAT& y);
   void ConvertTextSpace(FX_FLOAT& x, FX_FLOAT& y);
   void OnChangeTextMatrix();
   uint32_t Parse(const uint8_t* pData, uint32_t dwSize, uint32_t max_cost);
   void ParsePathObject();
   void AddPathPoint(FX_FLOAT x, FX_FLOAT y, int flag);
   void AddPathRect(FX_FLOAT x, FX_FLOAT y, FX_FLOAT w, FX_FLOAT h);
   void AddPathObject(int FillType, bool bStroke);
-  CPDF_ImageObject* AddImage(CPDF_Stream* pStream,
-                             CPDF_Image* pImage,
-                             bool bInline);
+  CPDF_ImageObject* AddImage(UniqueStream pStream);
+  CPDF_ImageObject* AddImage(uint32_t streamObjNum);
+  CPDF_ImageObject* AddImage(CPDF_Image* pImage);
+
   void AddForm(CPDF_Stream* pStream);
   void SetGraphicStates(CPDF_PageObject* pObj,
                         bool bColor,
                         bool bText,
                         bool bGraph);
   CPDF_Font* FindFont(const CFX_ByteString& name);
   CPDF_ColorSpace* FindColorSpace(const CFX_ByteString& name);
   CPDF_Pattern* FindPattern(const CFX_ByteString& name, bool bShading);
   CPDF_Object* FindResourceObj(const CFX_ByteString& type,
                                const CFX_ByteString& name);
 
  private:
   using OpCodes =
       std::unordered_map<uint32_t, void (CPDF_StreamContentParser::*)()>;
   static OpCodes InitializeOpCodes();
 
+  // Takes ownership of |pImageObj|, returns unowned pointer to it.
+  CPDF_ImageObject* AddImageObject(std::unique_ptr<CPDF_ImageObject> pImageObj);
+
   void Handle_CloseFillStrokePath();
   void Handle_FillStrokePath();
   void Handle_CloseEOFillStrokePath();
   void Handle_EOFillStrokePath();
   void Handle_BeginMarkedContent_Dictionary();
   void Handle_BeginImage();
   void Handle_BeginMarkedContent();
   void Handle_BeginText();
   void Handle_CurveTo_123();
   void Handle_ConcatMatrix();
@@ skipping 312 matching lines @@
   FX_FLOAT m_Comps[MAX_PATTERN_COLORCOMPS];
 };
 
 CFX_ByteStringC PDF_FindKeyAbbreviationForTesting(const CFX_ByteStringC& abbr);
 CFX_ByteStringC PDF_FindValueAbbreviationForTesting(
     const CFX_ByteStringC& abbr);
 
 void PDF_ReplaceAbbr(CPDF_Object* pObj);
 
 #endif  // CORE_FPDFAPI_PAGE_PAGEINT_H_