commit b301fcf1e0944c130b87faa99c30d62670599314
author Lei Zhang <thestig@chromium.org> Thu Jun 18 17:48:08 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Jun 18 17:48:08 2020 +0000
tree 3494496afa201043a28fe207c2561f17664a7ab4
parent 99f44ba64f74f2a7b1e68606995071d8abbe1a09

Mark more parameters in image loading code const.

Change-Id: Ic30fcc8429afd78c8ff4d5094d8f22ea334ebb7d
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/70630
Reviewed-by: Daniel Hosseinian <dhoss@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fpdfapi/page/cpdf_dib.cpp

diff --git a/core/fpdfapi/page/cpdf_dib.cpp b/core/fpdfapi/page/cpdf_dib.cpp
index 7dc2324..d1ab8c8 100644
--- a/core/fpdfapi/page/cpdf_dib.cpp
+++ b/core/fpdfapi/page/cpdf_dib.cpp
@@ -251,7 +251,7 @@
     const CPDF_Stream* pStream,
     bool bHasMask,
     const CPDF_Dictionary* pFormResources,
-    CPDF_Dictionary* pPageResources,
+    const CPDF_Dictionary* pPageResources,
     bool bStdCS,
     uint32_t GroupFamily,
     bool bLoadMask) {

core/fpdfapi/page/cpdf_dib.h

diff --git a/core/fpdfapi/page/cpdf_dib.h b/core/fpdfapi/page/cpdf_dib.h
index 66decf3..94db0e7 100644
--- a/core/fpdfapi/page/cpdf_dib.h
+++ b/core/fpdfapi/page/cpdf_dib.h
@@ -63,7 +63,7 @@
                              const CPDF_Stream* pStream,
                              bool bHasMask,
                              const CPDF_Dictionary* pFormResources,
-                             CPDF_Dictionary* pPageResources,
+                             const CPDF_Dictionary* pPageResources,
                              bool bStdCS,
                              uint32_t GroupFamily,
                              bool bLoadMask);

core/fpdfapi/page/cpdf_image.cpp

diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp
index f87a157..0262bce 100644
--- a/core/fpdfapi/page/cpdf_image.cpp
+++ b/core/fpdfapi/page/cpdf_image.cpp
@@ -350,7 +350,7 @@
 }
 
 bool CPDF_Image::StartLoadDIBBase(const CPDF_Dictionary* pFormResource,
-                                  CPDF_Dictionary* pPageResource,
+                                  const CPDF_Dictionary* pPageResource,
                                   bool bStdCS,
                                   uint32_t GroupFamily,
                                   bool bLoadMask) {

core/fpdfapi/page/cpdf_image.h

diff --git a/core/fpdfapi/page/cpdf_image.h b/core/fpdfapi/page/cpdf_image.h
index d5d8c0b..11a582d 100644
--- a/core/fpdfapi/page/cpdf_image.h
+++ b/core/fpdfapi/page/cpdf_image.h
@@ -54,7 +54,7 @@
 
   // Returns whether to Continue() or not.
   bool StartLoadDIBBase(const CPDF_Dictionary* pFormResource,
-                        CPDF_Dictionary* pPageResource,
+                        const CPDF_Dictionary* pPageResource,
                         bool bStdCS,
                         uint32_t GroupFamily,
                         bool bLoadMask);

core/fpdfapi/render/cpdf_imagecacheentry.cpp

diff --git a/core/fpdfapi/render/cpdf_imagecacheentry.cpp b/core/fpdfapi/render/cpdf_imagecacheentry.cpp
index fa25896..9513a81 100644
--- a/core/fpdfapi/render/cpdf_imagecacheentry.cpp
+++ b/core/fpdfapi/render/cpdf_imagecacheentry.cpp
@@ -54,7 +54,7 @@
 }
 
 CPDF_DIB::LoadState CPDF_ImageCacheEntry::StartGetCachedBitmap(
-    CPDF_Dictionary* pPageResources,
+    const CPDF_Dictionary* pPageResources,
     const CPDF_RenderStatus* pRenderStatus,
     bool bStdCS) {
   if (m_pCachedBitmap) {

core/fpdfapi/render/cpdf_imagecacheentry.h

diff --git a/core/fpdfapi/render/cpdf_imagecacheentry.h b/core/fpdfapi/render/cpdf_imagecacheentry.h
index 46e3f89..c48554e 100644
--- a/core/fpdfapi/render/cpdf_imagecacheentry.h
+++ b/core/fpdfapi/render/cpdf_imagecacheentry.h
@@ -30,7 +30,7 @@
   CPDF_Image* GetImage() const { return m_pImage.Get(); }
 
   CPDF_DIB::LoadState StartGetCachedBitmap(
-      CPDF_Dictionary* pPageResources,
+      const CPDF_Dictionary* pPageResources,
       const CPDF_RenderStatus* pRenderStatus,
       bool bStdCS);
 

core/fpdfapi/render/cpdf_renderstatus.h

diff --git a/core/fpdfapi/render/cpdf_renderstatus.h b/core/fpdfapi/render/cpdf_renderstatus.h
index 76eb71c..f5ed945 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.h
+++ b/core/fpdfapi/render/cpdf_renderstatus.h
@@ -86,7 +86,9 @@
   const CPDF_Dictionary* GetFormResource() const {
     return m_pFormResource.Get();
   }
-  CPDF_Dictionary* GetPageResource() const { return m_pPageResource.Get(); }
+  const CPDF_Dictionary* GetPageResource() const {
+    return m_pPageResource.Get();
+  }
   CFX_RenderDevice* GetRenderDevice() const { return m_pDevice; }
   const CPDF_RenderOptions& GetRenderOptions() const { return m_Options; }