commit 9924c98eb979a8370d88492db49a47fbf35d93a4
author Lei Zhang <thestig@chromium.org> Thu Mar 21 22:36:38 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Mar 21 22:36:38 2019 +0000
tree 62cfe8b611ddb312a90cc107c04e1eb53a1ca430
parent 9efb05d34d5224d38f2493d9fdd051b7996378a2

Give CPDF_NPageToOneExporter::AddSubPage() a return value.

And remove an in/out parameter.

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

fpdfsdk/fpdf_ppo.cpp

diff --git a/fpdfsdk/fpdf_ppo.cpp b/fpdfsdk/fpdf_ppo.cpp
index 687e657..f9b5753 100644
--- a/fpdfsdk/fpdf_ppo.cpp
+++ b/fpdfsdk/fpdf_ppo.cpp
@@ -552,13 +552,13 @@
   // Map XObject's object name to it's object number.
   using XObjectNameNumberMap = std::map<ByteString, uint32_t>;
 
-  // Creates a xobject from the source page dictionary, and appends the
-  // bsContent string with the xobject reference surrounded by the
-  // transformation matrix.
-  void AddSubPage(const CPDF_Dictionary* pSrcPageDict,
-                  const NupPageSettings& settings,
-                  XObjectNameNumberMap* pXObjNameNumberMap,
-                  ByteString* bsContent);
+  // Creates an XObject from |pSrcPageDict|, or find an existing XObject that
+  // represents |pSrcPageDict|. The transformation matrix is specified in
+  // |settings|.
+  // Returns the XObject reference surrounded by the transformation matrix.
+  ByteString AddSubPage(const CPDF_Dictionary* pSrcPageDict,
+                        const NupPageSettings& settings,
+                        XObjectNameNumberMap* pXObjNameNumberMap);
 
   // Creates an XObject from |pSrcPageDict|.
   // Returns the object number for the newly created XObject.
@@ -632,7 +632,7 @@
       auto srcPage = pdfium::MakeRetain<CPDF_Page>(src(), pSrcPageDict, true);
       NupPageSettings settings =
           nupState.CalculateNewPagePosition(srcPage->GetPageSize());
-      AddSubPage(pSrcPageDict, settings, &xObjNameNumberMap, &bsContent);
+      bsContent += AddSubPage(pSrcPageDict, settings, &xObjNameNumberMap);
     }
 
     // Finish up the current page.
@@ -643,11 +643,10 @@
   return true;
 }
 
-void CPDF_NPageToOneExporter::AddSubPage(
+ByteString CPDF_NPageToOneExporter::AddSubPage(
     const CPDF_Dictionary* pSrcPageDict,
     const NupPageSettings& settings,
-    XObjectNameNumberMap* pXObjNameNumberMap,
-    ByteString* bsContent) {
+    XObjectNameNumberMap* pXObjNameNumberMap) {
   uint32_t dwPageObjnum = pSrcPageDict->GetObjNum();
   ByteString bsXObjectName;
   const auto it = m_SrcPageXObjectMap.find(dwPageObjnum);
@@ -672,7 +671,7 @@
                 << matrix.a << " " << matrix.b << " " << matrix.c << " "
                 << matrix.d << " " << matrix.e << " " << matrix.f << " cm\n"
                 << "/" << bsXObjectName << " Do Q\n";
-  *bsContent += ByteString(contentStream);
+  return ByteString(contentStream);
 }
 
 uint32_t CPDF_NPageToOneExporter::MakeXObjectFromPage(