Make CPDF_Image() constructors saner.

core/fpdfapi/page/cpdf_docpagedata.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/cpdf_docpagedata.h"
 
 #include <algorithm>
 #include <set>
@@ skipping 379 matching lines @@
     return;
 
   // We have item only in m_PatternMap cache. Clean it.
   pPattern->clear();
 }
 
 CPDF_Image* CPDF_DocPageData::GetImage(CPDF_Object* pImageStream) {
   if (!pImageStream)
     return nullptr;
 
-  const uint32_t dwImageObjNum = pImageStream->GetObjNum();
-  auto it = m_ImageMap.find(dwImageObjNum);
+  ASSERT(!pImageStream->IsInline());
+  const uint32_t dwObjNum = pImageStream->GetObjNum();
+  auto it = m_ImageMap.find(dwObjNum);
   if (it != m_ImageMap.end())
     return it->second->AddRef();
 
-  CPDF_CountedImage* pCountedImage = new CPDF_CountedImage(
-      new CPDF_Image(m_pPDFDoc, pImageStream->AsStream(), false));
-  m_ImageMap[dwImageObjNum] = pCountedImage;
+  CPDF_CountedImage* pCountedImage =
+      new CPDF_CountedImage(new CPDF_Image(m_pPDFDoc, dwObjNum));
+  m_ImageMap[dwObjNum] = pCountedImage;
   return pCountedImage->AddRef();
 }
 
 void CPDF_DocPageData::ReleaseImage(const CPDF_Object* pImageStream) {
   if (!pImageStream)
     return;
 
   uint32_t dwObjNum = pImageStream->GetObjNum();
   if (!dwObjNum)
     return;
@@ skipping 118 matching lines @@
 }
 
 CPDF_CountedPattern* CPDF_DocPageData::FindPatternPtr(
     CPDF_Object* pPatternObj) const {
   if (!pPatternObj)
     return nullptr;
 
   auto it = m_PatternMap.find(pPatternObj);
   return it != m_PatternMap.end() ? it->second : nullptr;
 }