commit d14da8e682e244127db32490365d1c094243e5f3
author Tom Sepez <tsepez@chromium.org> Wed Jul 20 20:22:54 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jul 20 20:22:54 2022 +0000
tree 72e6df0c7850aaceb93b325e0b9f1a21ff8337ee
parent 244582a51772bdba8fe70c78a5cc23b82ac20de2

Remove argument from CPDF_Image::FinishInitialization().

It is always the same member.

Bug: pdfium:1843
Change-Id: If6fdca1fd93948f1e5dd74f86d9f4767853e39db
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/95413
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

core/fpdfapi/page/cpdf_image.cpp

diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp
index e3c5cfb..5c085fd 100644
--- a/core/fpdfapi/page/cpdf_image.cpp
+++ b/core/fpdfapi/page/cpdf_image.cpp
@@ -49,20 +49,21 @@
 CPDF_Image::CPDF_Image(CPDF_Document* pDoc, RetainPtr<CPDF_Stream> pStream)
     : m_bIsInline(true), m_pDocument(pDoc), m_pStream(std::move(pStream)) {
   DCHECK(m_pDocument);
-  FinishInitialization(m_pStream->GetMutableDict().Get());
+  FinishInitialization();
 }
 
 CPDF_Image::CPDF_Image(CPDF_Document* pDoc, uint32_t dwStreamObjNum)
     : m_pDocument(pDoc),
       m_pStream(ToStream(pDoc->GetIndirectObject(dwStreamObjNum))) {
   DCHECK(m_pDocument);
-  FinishInitialization(m_pStream->GetMutableDict().Get());
+  FinishInitialization();
 }
 
 CPDF_Image::~CPDF_Image() = default;
 
-void CPDF_Image::FinishInitialization(CPDF_Dictionary* pStreamDict) {
-  m_pOC.Reset(pStreamDict->GetDictFor("OC"));
+void CPDF_Image::FinishInitialization() {
+  RetainPtr<CPDF_Dictionary> pStreamDict = m_pStream->GetMutableDict();
+  m_pOC = pStreamDict->GetMutableDictFor("OC");
   m_bIsMask = !pStreamDict->KeyExist("ColorSpace") ||
               pStreamDict->GetBooleanFor("ImageMask", /*bDefault=*/false);
   m_bInterpolate = !!pStreamDict->GetIntegerFor("Interpolate");

core/fpdfapi/page/cpdf_image.h

diff --git a/core/fpdfapi/page/cpdf_image.h b/core/fpdfapi/page/cpdf_image.h
index 0bd38e6..5dcc130 100644
--- a/core/fpdfapi/page/cpdf_image.h
+++ b/core/fpdfapi/page/cpdf_image.h
@@ -71,7 +71,7 @@
   CPDF_Image(CPDF_Document* pDoc, uint32_t dwStreamObjNum);
   ~CPDF_Image() override;
 
-  void FinishInitialization(CPDF_Dictionary* pStreamDict);
+  void FinishInitialization();
   RetainPtr<CPDF_Dictionary> InitJPEG(pdfium::span<uint8_t> src_span);
   RetainPtr<CPDF_Dictionary> CreateXObjectImageDict(int width, int height);