commit 2dee06f04343c9660b35e4c2aa39b47d42858c05
author Lei Zhang <thestig@chromium.org> Tue Mar 21 23:19:24 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 21 23:19:24 2023 +0000
tree feb5668c70406ef27a9f18afa236c509997f21e7
parent b4357750c4e77f42f9aaa0a16694d5ac3f7f0b3d

Remove a toolchain workaround in FPDF_NewFormObjectFromXObject()

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

fpdfsdk/fpdf_ppo.cpp

diff --git a/fpdfsdk/fpdf_ppo.cpp b/fpdfsdk/fpdf_ppo.cpp
index ad8b900..f1fde22 100644
--- a/fpdfsdk/fpdf_ppo.cpp
+++ b/fpdfsdk/fpdf_ppo.cpp
@@ -833,14 +833,11 @@
   if (!xobj)
     return nullptr;
 
-  // If used directly with std::make_unique(), linking fails.
-  // Build toolchain bug?
-  constexpr int kNoContentStream = CPDF_PageObject::kNoContentStream;
   auto form = std::make_unique<CPDF_Form>(xobj->dest_doc, nullptr,
                                           xobj->xobject, nullptr);
   form->ParseContent(nullptr, nullptr, nullptr);
   auto form_object = std::make_unique<CPDF_FormObject>(
-      kNoContentStream, std::move(form), CFX_Matrix());
+      CPDF_PageObject::kNoContentStream, std::move(form), CFX_Matrix());
   return FPDFPageObjectFromCPDFPageObject(form_object.release());
 }