commit 78e30062275f70349ea05d6d9e9edfa40014a31d
author Lei Zhang <thestig@chromium.org> Fri Mar 01 00:12:10 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Mar 01 00:12:10 2024 +0000
tree 8dd96e93effa3f203e7b8bbae1c624f103a7dcff
parent be20f54f3d334ae9991d9368410c57da861f020c

Change GetColor() to WriteColorToStream()

In CPDF_PageContentGenerator, instead of having the caller get colors
with GetColor() and write them out to a stream, refactor the code so the
caller does the same work via WriteColorToStream(). This:

- Gets rid of an out-parameter that passes only a pointer to a buffer
  and assumes a particular buffer size.
- Centralizes the code that writes out colors for future improvements.

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

core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp

diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
index 1532b13..60a6ea9 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
@@ -52,21 +52,21 @@
 // Value: The resource names of a given type.
 using ResourcesMap = std::map<ByteString, std::set<ByteString>>;
 
-// TODO(thestig): Remove out parameter and raw pointer.
-bool GetColor(const CPDF_Color* pColor, float* rgb) {
-  if (!pColor || !pColor->IsColorSpaceRGB()) {
+// Returns whether it wrote to `buf` or not.
+bool WriteColorToStream(fxcrt::ostringstream& buf, const CPDF_Color* color) {
+  if (!color || !color->IsColorSpaceRGB()) {
     return false;
   }
 
-  std::optional<FX_COLORREF> colors = pColor->GetRGB();
+  std::optional<FX_COLORREF> colors = color->GetRGB();
   if (!colors.has_value()) {
     return false;
   }
 
   // TODO(thestig): Remove float to int to float conversion.
-  rgb[0] = FXSYS_GetRValue(colors.value()) / 255.0f;
-  rgb[1] = FXSYS_GetGValue(colors.value()) / 255.0f;
-  rgb[2] = FXSYS_GetBValue(colors.value()) / 255.0f;
+  buf << FXSYS_GetRValue(colors.value()) / 255.0f << " "
+      << FXSYS_GetGValue(colors.value()) / 255.0f << " "
+      << FXSYS_GetBValue(colors.value()) / 255.0f;
   return true;
 }
 
@@ -557,19 +557,16 @@
 void CPDF_PageContentGenerator::ProcessGraphics(fxcrt::ostringstream* buf,
                                                 CPDF_PageObject* pPageObj) {
   *buf << "q ";
-  float fillColor[3];
-  if (GetColor(pPageObj->color_state().GetFillColor(), fillColor)) {
-    *buf << fillColor[0] << " " << fillColor[1] << " " << fillColor[2]
-         << " rg ";
+  if (WriteColorToStream(*buf, pPageObj->color_state().GetFillColor())) {
+    *buf << " rg ";
   }
-  float strokeColor[3];
-  if (GetColor(pPageObj->color_state().GetStrokeColor(), strokeColor)) {
-    *buf << strokeColor[0] << " " << strokeColor[1] << " " << strokeColor[2]
-         << " RG ";
+  if (WriteColorToStream(*buf, pPageObj->color_state().GetStrokeColor())) {
+    *buf << " RG ";
   }
-  float lineWidth = pPageObj->graph_state().GetLineWidth();
-  if (lineWidth != 1.0f)
-    WriteFloat(*buf, lineWidth) << " w ";
+  float line_width = pPageObj->graph_state().GetLineWidth();
+  if (line_width != 1.0f) {
+    WriteFloat(*buf, line_width) << " w ";
+  }
   CFX_GraphStateData::LineCap lineCap = pPageObj->graph_state().GetLineCap();
   if (lineCap != CFX_GraphStateData::LineCap::kButt)
     *buf << static_cast<int>(lineCap) << " J ";