commit 459ad7fe015ed4858ed881fcf81dca3eaadc91f3
author Lei Zhang <thestig@chromium.org> Thu Mar 21 23:24:08 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Mar 21 23:24:08 2019 +0000
tree 0594b55c798c79d58f75ab17411b3a2d6fe4d9d4
parent 0f78860e3faf0e230fd6d6301eda2cd9c39a5a24

Fix bad merge from commit cd86b7b5.

|m_ObjectNumberMap| became a private member of CPDF_PageOrganizer, so
a method is needed to clear it from a CPDF_PageOrganizer subclass.

TBR=tsepez@chromium.org
NOTREECHECKS=true

Change-Id: I87a80b455a7017c0f0a572f3b9d6b676939b79f2
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/52175
Reviewed-by: Lei Zhang <thestig@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 059abd6..2cd86d6 100644
--- a/fpdfsdk/fpdf_ppo.cpp
+++ b/fpdfsdk/fpdf_ppo.cpp
@@ -289,6 +289,8 @@
     m_ObjectNumberMap[dwOldPageObj] = dwNewPageObj;
   }
 
+  void ClearObjectNumberMap() { m_ObjectNumberMap.clear(); }
+
  private:
   uint32_t GetNewObjId(CPDF_Reference* pRef);
 
@@ -598,7 +600,7 @@
   if (!safe_numPagesPerSheet.IsValid())
     return false;
 
-  m_ObjectNumberMap.clear();
+  ClearObjectNumberMap();
   m_SrcPageXObjectMap.clear();
   size_t numPagesPerSheet = safe_numPagesPerSheet.ValueOrDie();
   NupState nupState(destPageSize, numPagesOnXAxis, numPagesOnYAxis);