From 1fc533150a27257de4830559a14499f2e903dce9 Mon Sep 17 00:00:00 2001 From: Daniel Bratell Date: Thu, 1 Feb 2018 14:40:35 +0000 Subject: [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 Commit-Queue: dsinclair --- fpdfsdk/fpdfppo.cpp | 4 ++-- 1 file 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(); - CPDF_Object* pSrcContentObj = GetPageContent(pSrcPageDict); + CPDF_Object* pSrcContentObj = GetPageOrganizerPageContent(pSrcPageDict); CPDF_Stream* pNewXObject = pDestDoc->NewIndirect( nullptr, 0, pdfium::MakeUnique(pDestDoc->GetByteStringPool())); -- cgit v1.2.3