diff options
author | Daniel Bratell <bratell@opera.com> | 2018-02-01 14:40:35 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-02-01 14:40:35 +0000 |
commit | 1fc533150a27257de4830559a14499f2e903dce9 (patch) | |
tree | 78b9680a4087ed09ac45cb9806ac29048059285c /fpdfsdk | |
parent | f5ca90c00198c72488fd337ec8029a7f74b335b8 (diff) | |
download | pdfium-1fc533150a27257de4830559a14499f2e903dce9.tar.xz |
[jumbo] Compile fix: Move a GetPageContent to a more limited scope
There is a GetPageContent in pdfsdk/fpdfppo.cpp and one in
fpdfsdk/fpdf_transformpage.cpp, both in the anonymous namespace. In jumbo
builds those two files compile in the same translation unit and then
they share the same anonymous namespace and clash.
Given that the function is small and that I saw no natural place to
share it, this patch moves one instance into the class that is
using it.
Change-Id: Icbdf69bd83887c6e5cf31d2080a5b12b5710691e
Reviewed-on: https://pdfium-review.googlesource.com/24990
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk')
-rw-r--r-- | fpdfsdk/fpdfppo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpdfsdk/fpdfppo.cpp b/fpdfsdk/fpdfppo.cpp index 57417b56c7..3e6f099277 100644 --- a/fpdfsdk/fpdfppo.cpp +++ b/fpdfsdk/fpdfppo.cpp @@ -195,7 +195,7 @@ CFX_FloatRect GetTrimBox(CPDF_Dictionary* pPageDict) { return GetCropBox(pPageDict); } -CPDF_Object* GetPageContent(CPDF_Dictionary* pPageDict) { +CPDF_Object* GetPageOrganizerPageContent(CPDF_Dictionary* pPageDict) { return pPageDict ? pPageDict->GetDirectObjectFor("Contents") : nullptr; } @@ -398,7 +398,7 @@ CPDF_Object* CPDF_PageOrganizer::MakeXObject(CPDF_Dictionary* pSrcPageDict, auto pObjNumberMap = pdfium::MakeUnique<ObjectNumberMap>(); - CPDF_Object* pSrcContentObj = GetPageContent(pSrcPageDict); + CPDF_Object* pSrcContentObj = GetPageOrganizerPageContent(pSrcPageDict); CPDF_Stream* pNewXObject = pDestDoc->NewIndirect<CPDF_Stream>( nullptr, 0, pdfium::MakeUnique<CPDF_Dictionary>(pDestDoc->GetByteStringPool())); |