commit a80a8cbfdf7fa64adb743a9ca203124785656ca3
author Lei Zhang <thestig@chromium.org> Sat Jun 01 04:00:37 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Jun 01 04:00:37 2024 +0000
tree b940e07481ebfa20911c581914335389e28675ed
parent 4d69c464530a871cfbb1566d6c2fbef28749ac4d

Remove `CPDF_IndexedCS::base_component_count_`

This value is already stored as the size of `component_min_max_`.

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

core/fpdfapi/page/cpdf_indexedcs.cpp

diff --git a/core/fpdfapi/page/cpdf_indexedcs.cpp b/core/fpdfapi/page/cpdf_indexedcs.cpp
index 6c11b9e..7ec1925 100644
--- a/core/fpdfapi/page/cpdf_indexedcs.cpp
+++ b/core/fpdfapi/page/cpdf_indexedcs.cpp
@@ -54,9 +54,9 @@
     return 0;
   }
 
-  base_component_count_ = m_pBaseCS->ComponentCount();
-  DCHECK(base_component_count_);
-  component_min_max_ = DataVector<IndexedColorMinMax>(base_component_count_);
+  uint32_t base_component_count = m_pBaseCS->ComponentCount();
+  DCHECK(base_component_count);
+  component_min_max_ = DataVector<IndexedColorMinMax>(base_component_count);
   float defvalue;
   for (uint32_t i = 0; i < component_min_max_.size(); i++) {
     IndexedColorMinMax& comp = component_min_max_[i];
@@ -98,12 +98,12 @@
     return false;
   }
 
-  DCHECK(base_component_count_);
-  DCHECK_EQ(base_component_count_, m_pBaseCS->ComponentCount());
+  DCHECK(!component_min_max_.empty());
+  DCHECK_EQ(component_min_max_.size(), m_pBaseCS->ComponentCount());
 
   FX_SAFE_SIZE_T length = index;
   length += 1;
-  length *= base_component_count_;
+  length *= component_min_max_.size();
   if (!length.IsValid() || length.ValueOrDie() > lookup_table_.size()) {
     *R = 0;
     *G = 0;
@@ -111,11 +111,12 @@
     return false;
   }
 
-  DataVector<float> comps(base_component_count_);
-  for (uint32_t i = 0; i < base_component_count_; ++i) {
-    comps[i] = component_min_max_[i].min +
-               component_min_max_[i].max *
-                   lookup_table_[index * base_component_count_ + i] / 255;
+  DataVector<float> comps(component_min_max_.size());
+  for (uint32_t i = 0; i < component_min_max_.size(); ++i) {
+    const IndexedColorMinMax& comp = component_min_max_[i];
+    comps[i] =
+        comp.min +
+        comp.max * lookup_table_[index * component_min_max_.size() + i] / 255;
   }
   return m_pBaseCS->GetRGB(comps, R, G, B);
 }

core/fpdfapi/page/cpdf_indexedcs.h

diff --git a/core/fpdfapi/page/cpdf_indexedcs.h b/core/fpdfapi/page/cpdf_indexedcs.h
index 4e2cffd..b3d774f 100644
--- a/core/fpdfapi/page/cpdf_indexedcs.h
+++ b/core/fpdfapi/page/cpdf_indexedcs.h
@@ -42,7 +42,6 @@
  private:
   CPDF_IndexedCS();
 
-  uint32_t base_component_count_ = 0;
   int max_index_ = 0;
   DataVector<uint8_t> lookup_table_;
   DataVector<IndexedColorMinMax> component_min_max_;