commit d9dcf21d3db567abb13eaf85587bef8880977200
author Tom Sepez <tsepez@chromium.org> Fri Jul 14 18:12:28 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jul 14 18:12:28 2023 +0000
tree f4f6491b7c0e0de90219c6f76443e5cfab0d371f
parent acfec013fe5ca13916d2c5192815c8b941823f14

Avoid unnecessary array indexing in CPDF_DefaultAppearance

Avoid possible warnings down the road about native C-style arrays that
have not been converted to std::array<>. This is easy enough to just
avoid doing in the first place.

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

core/fpdfdoc/cpdf_defaultappearance.cpp

diff --git a/core/fpdfdoc/cpdf_defaultappearance.cpp b/core/fpdfdoc/cpdf_defaultappearance.cpp
index 63eba37..e3b91a9 100644
--- a/core/fpdfdoc/cpdf_defaultappearance.cpp
+++ b/core/fpdfdoc/cpdf_defaultappearance.cpp
@@ -84,24 +84,23 @@
   if (m_csDA.IsEmpty())
     return absl::nullopt;
 
-  float fc[4];
   CPDF_SimpleParser syntax(m_csDA.AsStringView().raw_span());
   if (FindTagParamFromStart(&syntax, "g", 1)) {
-    fc[0] = StringToFloat(syntax.GetWord());
-    return CFX_Color(CFX_Color::Type::kGray, fc[0]);
+    float gray = StringToFloat(syntax.GetWord());
+    return CFX_Color(CFX_Color::Type::kGray, gray);
   }
   if (FindTagParamFromStart(&syntax, "rg", 3)) {
-    fc[0] = StringToFloat(syntax.GetWord());
-    fc[1] = StringToFloat(syntax.GetWord());
-    fc[2] = StringToFloat(syntax.GetWord());
-    return CFX_Color(CFX_Color::Type::kRGB, fc[0], fc[1], fc[2]);
+    float r = StringToFloat(syntax.GetWord());
+    float g = StringToFloat(syntax.GetWord());
+    float b = StringToFloat(syntax.GetWord());
+    return CFX_Color(CFX_Color::Type::kRGB, r, g, b);
   }
   if (FindTagParamFromStart(&syntax, "k", 4)) {
-    fc[0] = StringToFloat(syntax.GetWord());
-    fc[1] = StringToFloat(syntax.GetWord());
-    fc[2] = StringToFloat(syntax.GetWord());
-    fc[3] = StringToFloat(syntax.GetWord());
-    return CFX_Color(CFX_Color::Type::kCMYK, fc[0], fc[1], fc[2], fc[3]);
+    float c = StringToFloat(syntax.GetWord());
+    float m = StringToFloat(syntax.GetWord());
+    float y = StringToFloat(syntax.GetWord());
+    float k = StringToFloat(syntax.GetWord());
+    return CFX_Color(CFX_Color::Type::kCMYK, c, m, y, k);
   }
   return absl::nullopt;
 }