commit 0bba2ec8deec71366e29892243248cce93bfa2b5
author Lei Zhang <thestig@chromium.org> Tue Aug 27 17:10:33 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 27 17:10:33 2024 +0000
tree 79d2862bd40568a1555003a3fe847387a63cf6fd
parent 0659d7c51bd0d88c3e9320ab4a3e3772dd59ce87

Remove a CPDF_ImageRenderer::Start() parameter

The BlendMode parameter is always set to BlendMode::kNormal.

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

core/fpdfapi/render/cpdf_imagerenderer.cpp

diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp
index 4f02056..035dfea 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.cpp
+++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp
@@ -178,12 +178,11 @@
 
 bool CPDF_ImageRenderer::Start(CPDF_ImageObject* pImageObject,
                                const CFX_Matrix& mtObj2Device,
-                               bool bStdCS,
-                               BlendMode blendType) {
+                               bool bStdCS) {
   DCHECK(pImageObject);
   m_bStdCS = bStdCS;
   m_pImageObject = pImageObject;
-  m_BlendType = blendType;
+  m_BlendType = BlendMode::kNormal;
   m_mtObj2Device = mtObj2Device;
   RetainPtr<const CPDF_Dictionary> pOC = m_pImageObject->GetImage()->GetOC();
   if (pOC && !GetRenderOptions().CheckOCGDictVisible(pOC))

core/fpdfapi/render/cpdf_imagerenderer.h

diff --git a/core/fpdfapi/render/cpdf_imagerenderer.h b/core/fpdfapi/render/cpdf_imagerenderer.h
index 54489bf..77c2f97 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.h
+++ b/core/fpdfapi/render/cpdf_imagerenderer.h
@@ -38,8 +38,7 @@
 
   bool Start(CPDF_ImageObject* pImageObject,
              const CFX_Matrix& mtObj2Device,
-             bool bStdCS,
-             BlendMode blendType);
+             bool bStdCS);
 
   bool Start(RetainPtr<CFX_DIBBase> pDIBBase,
              FX_ARGB bitmap_argb,

core/fpdfapi/render/cpdf_renderstatus.cpp

diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index 5369dd9..2082fc7 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -274,8 +274,8 @@
   }
 
   m_pImageRenderer = std::make_unique<CPDF_ImageRenderer>(this);
-  if (!m_pImageRenderer->Start(pObj->AsImage(), mtObj2Device, false,
-                               BlendMode::kNormal)) {
+  if (!m_pImageRenderer->Start(pObj->AsImage(), mtObj2Device,
+                               /*bStdCS=*/false)) {
     if (!m_pImageRenderer->GetResult())
       DrawObjWithBackground(pObj, mtObj2Device);
     m_pImageRenderer.reset();
@@ -1229,7 +1229,7 @@
 bool CPDF_RenderStatus::ProcessImage(CPDF_ImageObject* pImageObj,
                                      const CFX_Matrix& mtObj2Device) {
   CPDF_ImageRenderer render(this);
-  if (render.Start(pImageObj, mtObj2Device, m_bStdCS, BlendMode::kNormal)) {
+  if (render.Start(pImageObj, mtObj2Device, m_bStdCS)) {
     render.Continue(nullptr);
   }
   return render.GetResult();

fpdfsdk/fpdf_editimg.cpp

diff --git a/fpdfsdk/fpdf_editimg.cpp b/fpdfsdk/fpdf_editimg.cpp
index 4cf4814..4da555f 100644
--- a/fpdfsdk/fpdf_editimg.cpp
+++ b/fpdfsdk/fpdf_editimg.cpp
@@ -330,10 +330,10 @@
   render_matrix.Translate(-min_x, min_y);
 
   // Do the actual rendering.
-  bool should_continue = renderer.Start(image, render_matrix,
-                                        /*bStdCS=*/false, BlendMode::kNormal);
-  while (should_continue)
+  bool should_continue = renderer.Start(image, render_matrix, /*bStdCS=*/false);
+  while (should_continue) {
     should_continue = renderer.Continue(/*pPause=*/nullptr);
+  }
 
   if (!renderer.GetResult())
     return nullptr;