From ef9fe9ed8a00be4a1788228cfa5df303e34d4d73 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 12 Jun 2018 20:26:56 +0000 Subject: FPDFPage_New(), FPDF_LoadPage(): Fallthru into PDF case if no XFA context. Now that there is a consistent underlying page type, we can unify these actions. Change-Id: I13fdfe775c540baaa0cd8085f8a7999fa6a3d276 Reviewed-on: https://pdfium-review.googlesource.com/34970 Reviewed-by: dsinclair Commit-Queue: Tom Sepez --- fpdfsdk/fpdf_editpage.cpp | 6 ++---- fpdfsdk/fpdf_view.cpp | 5 +---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp index 9dcd470978..4acb5b6cb5 100644 --- a/fpdfsdk/fpdf_editpage.cpp +++ b/fpdfsdk/fpdf_editpage.cpp @@ -199,13 +199,11 @@ FPDF_EXPORT FPDF_PAGE FPDF_CALLCONV FPDFPage_New(FPDF_DOCUMENT document, pXFAPage->LoadPDFPage(pPageDict); return FPDFPageFromIPDFPage(pXFAPage.Leak()); // Caller takes ownership. } - // Eventually, fallthru into non-XFA case once page type is consistent. - return nullptr; -#else // PDF_ENABLE_XFA +#endif // PDF_ENABLE_XFA + auto pPage = pdfium::MakeRetain(pDoc, pPageDict, true); pPage->ParseContent(); return FPDFPageFromIPDFPage(pPage.Leak()); // Caller takes ownership. -#endif // PDF_ENABLE_XFA } FPDF_EXPORT int FPDF_CALLCONV FPDFPage_GetRotation(FPDF_PAGE page) { diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp index bfaf537feb..0e76548abf 100644 --- a/fpdfsdk/fpdf_view.cpp +++ b/fpdfsdk/fpdf_view.cpp @@ -343,10 +343,8 @@ FPDF_EXPORT FPDF_PAGE FPDF_CALLCONV FPDF_LoadPage(FPDF_DOCUMENT document, auto* pContext = static_cast(pDoc->GetExtension()); if (pContext) return FPDFPageFromIPDFPage(pContext->GetXFAPage(page_index).Leak()); +#endif // PDF_ENABLE_XFA - // Eventually, fallthrough into non-xfa case once page type made consistent. - return nullptr; -#else // PDF_ENABLE_XFA CPDF_Dictionary* pDict = pDoc->GetPageDictionary(page_index); if (!pDict) return nullptr; @@ -354,7 +352,6 @@ FPDF_EXPORT FPDF_PAGE FPDF_CALLCONV FPDF_LoadPage(FPDF_DOCUMENT document, auto pPage = pdfium::MakeRetain(pDoc, pDict, true); pPage->ParseContent(); return FPDFPageFromIPDFPage(pPage.Leak()); -#endif // PDF_ENABLE_XFA } FPDF_EXPORT double FPDF_CALLCONV FPDF_GetPageWidth(FPDF_PAGE page) { -- cgit v1.2.3